Merge branch 'wxz_bug_fix'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -181,6 +181,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Autowired
     private IcVaccineRelationDao icVaccineRelationDao;
 
+    /**
+     * 组织字段，目前用于居民信息动态查询接口。将此条件从conditions中移除，单独生成固定的sql片段
+     */
     public static final List<String> ORG_FIELDS = Arrays.asList("AGENCY_IDS", "GRID_IDS", "AGENCY_ID", "GRID_ID");
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
@@ -928,7 +931,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Set<String> queryAgencyIdList = new HashSet<>();
         Set<String> queryGridIdList = new HashSet<>();
 
-        // 将以下几列单独提出来，组合起来，放入列表
+        // 将以下几列单独提出来，组合起来，放入集合，自动去重
         formDTO.getConditions().stream().forEach(c -> {
             if (IcResiUserConstant.IC_RESI_USER.equals(c.getTableName()) && CollectionUtils.isNotEmpty(c.getColumnValue())
                     && StringUtils.isNotBlank(c.getColumnValue().get(NumConstant.ZERO))) {
@@ -936,9 +939,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     queryAgencyIdList.addAll(c.getColumnValue());
                 } else if ("GRID_IDS".equals(c.getColumnName())) {
                     queryGridIdList.addAll(c.getColumnValue());
-                } else if ("AGENCY_ID".equals(c.getColumnName()) && ! queryAgencyIdList.contains(c.getColumnValue())) {
+                } else if ("AGENCY_ID".equals(c.getColumnName())) {
                     queryAgencyIdList.addAll(c.getColumnValue());
-                } else if ("GRID_ID".equals(c.getColumnName()) && ! queryGridIdList.contains(c.getColumnValue())) {
+                } else if ("GRID_ID".equals(c.getColumnName())) {
                     queryGridIdList.addAll(c.getColumnValue());
                 }
             }
@@ -955,13 +958,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
             agencyIds = Arrays.asList(staffInfoCacheResult.getAgencyId());
 
-            String op;
+            String op = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds());
-            if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-                op = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
-            } else {
-                op = staffInfoCacheResult.getAgencyId();
-            }
-
             staffOrgPaths = Arrays.asList(op);
         } else {
             // 将组织id列表，转化为组织orgIdPath列表
@@ -3365,9 +3362,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     queryAgencyIdList.addAll(c.getColumnValue());
                 } else if ("GRID_IDS".equals(c.getColumnName())) {
                     queryGridIdList.addAll(c.getColumnValue());
-                } else if ("AGENCY_ID".equals(c.getColumnName()) && ! queryAgencyIdList.contains(c.getColumnValue())) {
+                } else if ("AGENCY_ID".equals(c.getColumnName())) {
                     queryAgencyIdList.addAll(c.getColumnValue());
-                } else if ("GRID_ID".equals(c.getColumnName()) && ! queryGridIdList.contains(c.getColumnValue())) {
+                } else if ("GRID_ID".equals(c.getColumnName())) {
                     queryGridIdList.addAll(c.getColumnValue());
                 }
             }
@@ -3384,13 +3381,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
             agencyIds = Arrays.asList(staffInfoCacheResult.getAgencyId());
 
-            String op;
+            String op = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds());
-            if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-                op = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
-            } else {
-                op = staffInfoCacheResult.getAgencyId();
-            }
-
             staffOrgPaths = Arrays.asList(op);
         } else {
             // 将组织id列表，转化为组织orgIdPath列表