修改部分代码

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/caxx/CaxxServiceImpl.java

@@ -27,6 +27,7 @@ import com.unis.framework.common.util.object.BeanUtils;
 
 import com.unis.module.coding.dal.mysql.caxx.CaxxMapper;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -174,14 +175,11 @@ public class CaxxServiceImpl implements CaxxService {
                 throw exception(ERROR,"当前用户不存在角色信息");
             }
             String[] items = roleIds.split(",");
-            Set<Long> roleIdList = new HashSet<>();
-            for (String item : items) {
-                roleIdList.add(Long.parseLong(item.trim()));
-            }
+            List<String> roleIdList = Arrays.asList(items);
             if (roleIdList.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
                 String bankType = loginUser.getInfo().get("bankType");
-                if (StringUtils.isBlank(bankType)){
-                    throw exception(ERROR,"当前银行用户不存在银行信息");
+                if (StringUtils.isBlank(bankType)) {
+                    throw exception(ERROR, "当前银行用户不存在银行信息");
                 }
                 pageReqVO.setYhmc(bankType);
                 page = caxxMapper.getIdentifyPageForBank(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
@@ -219,10 +217,7 @@ public class CaxxServiceImpl implements CaxxService {
                 throw exception(ERROR,"当前用户不存在角色信息");
             }
             String[] items = roleIds.split(",");
-            Set<Long> roleIdList = new HashSet<>();
-            for (String item : items) {
-                roleIdList.add(Long.parseLong(item.trim()));
-            }
+            List<String> roleIdList = Arrays.asList(items);
             if (roleIdList.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
                 String bankType = loginUser.getInfo().get("bankType");
                 if (StringUtils.isBlank(bankType)){

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -217,7 +217,7 @@
             ck.LXDH lxdh,
             ifnull(t1.yxcfnum, 0) yxcfnum,
             ifnull(t2.yhrdnum, 0) yhrdnum,
-            t1.rdyh_name
+            t2.rdyh_name
         from DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join
@@ -234,7 +234,8 @@
         (
                 select
                         KQ_ID,
-                        count(CA_ID) yhrdnum
+                        count(CA_ID) yhrdnum,
+                        rdyh_name
                 from DELIVERY_BANK
                 where  DELETED=0 and HY_STATE=1
                 group by  KQ_ID
@@ -352,7 +353,7 @@
             ck.LXDH lxdh,
             ifnull(t1.yxcfnum, 0) yxcfnum,
             ifnull(t2.yhrdnum, 0) yhrdnum,
-            t1.rdyh_name
+            t2.rdyh_name
         from DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join

delivery-module-system/delivery-module-system-api/src/main/java/com/unis/module/system/enums/permission/RoleIdEnum.java

@@ -13,16 +13,16 @@ public enum RoleIdEnum {
     /**
      * 超级管理员
      */
-    SYSTEM_ADMIN(1L),
+    SYSTEM_ADMIN("1"),
     /**
      * 银行用户
      */
-    BANK_ADMIN(632188567941189L),
+    BANK_ADMIN("632188567941189L"),
     ;
 
     /**
      * 角色ID
      */
-    private final Long roleId;
+    private final String roleId;
 
 }