diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
index 43a7075c..b6305c4f 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
@@ -182,7 +182,13 @@ public class HighOrderController {
map.put("companyId", companyId);
} else if (userInfoModel.getSecUser().getObjectType() == 1) {
- map.put("companyId", userInfoModel.getBsCompany().getId());
+
+ if (userInfoModel.getBsCompany().getId() == 3) {
+ map.put("companyId", 23);
+ } else {
+ map.put("companyId", userInfoModel.getBsCompany().getId());
+ }
+
map.put("merchantId", merchantId);
} else if (userInfoModel.getSecUser().getObjectType() == 2) {
diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
index 19f1e137..11a7406c 100644
--- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
@@ -96,8 +96,9 @@ public interface OutRechargeOrderMapperExt {
" ",
" = #{map.payTimeS} ]]> ",
" ",
+ " group by pay_time " +
" ORDER BY" +
- " a.create_timed DESC" +
+ " a.create_timed DESC " +
""
})
List selectOrderCount(@Param("map") Map map);
diff --git a/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java
index bd390b9d..6a2ed729 100644
--- a/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java
@@ -75,7 +75,7 @@ public class BsCompanyServiceImpl implements BsCompanyService {
bsOrganizationMapper.updateByPrimaryKey(secOrganization);
// 保存用户角色
SecUserRoleRel userRole = new SecUserRoleRel();
- userRole.setUserId(secUser.getId());
+ userRole.setUserId(secUser.getId());
userRole.setRoleId(5L);
secUserRoleRelMapper.insert(userRole);
}