交收库查询省市县优化

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -191,6 +191,8 @@ public class DwxxServiceImpl implements DwxxService {
         if (StringUtils.isNotBlank(pageReqVO.getDwmc())) {
             pageReqVO.setDwmc(String.format("%s%s%s", "%", pageReqVO.getDwmc(), "%"));
         }
+        // 从登录用户信息中获取角色ID字符串
+        String roleIds = loginUser.getInfo().get("roleIds");
         String areaLevel = loginUser.getInfo().get("areaLevel");
         Page<DeliveryRespVO> page = new Page<DeliveryRespVO>();
         // 国家交易中心已选
@@ -208,8 +210,6 @@ public class DwxxServiceImpl implements DwxxService {
                 setAreaCodeBasedOnLevel(pageReqVO, allAreaLevels);
             }
 
-            // 从登录用户信息中获取角色ID字符串
-            String roleIds = loginUser.getInfo().get("roleIds");
             // 检查角色ID字符串中是否包含银行管理员角色ID
             if (roleIds != null && roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())){
                 // 若包含银行管理员角色ID，从登录用户信息中获取银行类型
@@ -253,7 +253,7 @@ public class DwxxServiceImpl implements DwxxService {
                      s.setCfzt(pageReqVO.getCfzt());
                      s.setCfEnd(pageReqVO.getCfEnd());
                      s.setCfStart(pageReqVO.getCfStart());
-                    if (Arrays.asList(CityConstants.CITY).contains(s.getSheng()) && ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel))) {
+                    if (Arrays.asList(CityConstants.CITY).contains(s.getSheng()) && ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) && roleIds != null && !roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
                         s.setShi(s.getXian());
                         s.setXian(null);
                     }
@@ -284,17 +284,14 @@ public class DwxxServiceImpl implements DwxxService {
                     if (StringUtils.isBlank(bankType)) {
                         throw exception(ERROR, "当前银行用户不存在银行信息");
                     }
-                    List<StoreRespVO> storeListForBank = getStoreListByBank(pageReqVO, bankType);
-                    return storeListForBank;
+                    return getStoreListByBank(pageReqVO, bankType);
                 } else {// 国家已选
-                    List<StoreRespVO> storeListForNation = getStoreListByNation(pageReqVO);
-                    return storeListForNation;
+                    return getStoreListByNation(pageReqVO);
                 }
             }
         }
         if ("1".equals(areaLevel)) {
-            List<StoreRespVO> storeListForProvice = getStoreListByProvince(pageReqVO);
-            return storeListForProvice;
+            return getStoreListByProvince(pageReqVO);
         }
         return null;
     }