From 8bb9e3efd29c45ca04b0dcdcab9564064df89c58 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 6 Apr 2023 15:20:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF-=E6=89=80=E5=B1=9E=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B(=E5=B0=8F=E5=8C=BA=E5=88=97=E8=A1=A8)=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=A4=9A=E9=80=89=EF=BC=8C=E5=B0=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B9=9F=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?agencyIds/gridIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcNeighborHoodDTO.java | 11 ++++++++++
 .../controller/IcNeighborHoodController.java  | 10 +++++++--
 .../epmet/service/IcNeighborHoodService.java  |  3 ++-
 .../impl/IcNeighborHoodServiceImpl.java       | 21 ++++++++++++-------
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
index dbf18ee25a..8e39699670 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -54,6 +55,11 @@ public class IcNeighborHoodDTO implements Serializable {
      */
 	private String agencyId;
 
+    /**
+     * agencyId列表
+     */
+    private List<String> agencyIds;
+
     /**
      * 上级组织id
      */
@@ -69,6 +75,11 @@ public class IcNeighborHoodDTO implements Serializable {
      */
 	private String gridId;
 
+    /**
+     * gridId列表
+     */
+    private List<String> gridIds;
+
     /**
      * 网格
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
index a8cf04b4cb..43b2d4bd60 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -141,7 +141,7 @@ public class IcNeighborHoodController {
     }
 
     /**
-     * @Description 获取网格下小区列表
+     * @Description 获取组织/网格下小区列表，支持单选和多选
      * @Param dto
      * @Return {@link Result< List< OptionResultDTO>>}
      * @Author zhaoqifeng
@@ -149,7 +149,13 @@ public class IcNeighborHoodController {
      */
     @PostMapping("neighborhoodoption")
     public Result<List<OptionResultDTO>> getNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
-        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId()));
+        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(
+                dto.getAgencyId(),
+                dto.getGridId(),
+                dto.getAgencyIds(),
+                dto.getGridIds(),
+                tokenDto.getUserId(),
+                tokenDto.getCustomerId()));
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
index 2755cf3af0..5ffb6a19e8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
@@ -117,7 +117,8 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @Author zhaoqifeng
      * @Date 2021/10/26 14:32
      */
-    List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId);
+    List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId, List<String> agencyIds, List<String> gridIds,
+                                                 String staffId,String customerId);
 
     /**
      * 获取用户组织下小区列表
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 56e473038d..7b863857f9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -185,22 +185,29 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
      * @Date 2021/10/26 14:32
      */
     @Override
-    public List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId) {
-        if (StringUtils.isBlank(agencyId)&&StringUtils.isEmpty(gridId)) {
-            log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
-            CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(customerId,staffId);
+    public List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,
+                                                        List<String> agencyIds, List<String> gridIds,
+                                                        String staffId,String customerId) {
+        if (StringUtils.isBlank(agencyId)
+                && StringUtils.isEmpty(gridId)
+                && CollectionUtils.isEmpty(agencyIds)
+                && CollectionUtils.isEmpty(gridIds)) {
+            log.info("agencyId(s)与gridId(s)都为空时，默认查询当前工作人员所属组织下的小区");
+            CustomerStaffInfoCacheResult result = CustomerStaffRedis.getStaffInfo(customerId, staffId);
             if (null == result || StringUtils.isBlank(result.getAgencyId())) {
                 log.error(String.format("staffId:%s,工作人员缓存信息查询异常", staffId));
                 return Collections.emptyList();
             }
-           agencyId=result.getAgencyId();
+            agencyId = result.getAgencyId();
         }
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(agencyId),IcNeighborHoodEntity::getAgencyId, agencyId);
+        wrapper.eq(StringUtils.isNotBlank(agencyId), IcNeighborHoodEntity::getAgencyId, agencyId);
         wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId);
+        wrapper.in(!CollectionUtils.isEmpty(agencyIds), IcNeighborHoodEntity::getAgencyId, agencyIds);
+        wrapper.in(!CollectionUtils.isEmpty(gridIds), IcNeighborHoodEntity::getGridId, gridIds);
         wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
         List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
-        if(CollectionUtils.isEmpty(list)) {
+        if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
         return list.stream().map(item -> {

From 14fa4f64a18a8bd3d05ed3d580bf516cbf70d979 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 6 Apr 2023 16:41:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96"?=
 =?UTF-8?q?=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6"=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=B0=86sql=E4=B8=AD=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcCoverageCategoryDictDao.xml      | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml
index dce1591d30..d7a99f153b 100755
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml
@@ -7,11 +7,14 @@
         INSERT INTO ic_coverage_category_dict (
             id,
             customer_id,
-            category_key,
-            category_name,
-            place_type,
-            coverage_type,
-            sort,
+            CATEGORY_KEY,
+            CATEGORY_NAME,
+            PLACE_TYPE,
+            PLACE_TYPE_IN_ANALYSIS,
+            MENU_URL,
+            DATA_TYPE,
+            COVERAGE_TYPE,
+            SORT,
             del_flag,
             revision,
             created_by,
@@ -19,24 +22,27 @@
             updated_by,
             updated_time
         ) SELECT
-            MD5(UUID()),
-            #{customerId},
-            category_key,
-            category_name,
-            place_type,
-            coverage_type,
-            sort,
-            del_flag,
-            revision,
-            'APP_USER',
-            NOW(),
-            'APP_USER',
-            NOW()
+              MD5(UUID()),
+              #{customerId},
+              CATEGORY_KEY,
+              CATEGORY_NAME,
+              PLACE_TYPE,
+              PLACE_TYPE_IN_ANALYSIS,
+              MENU_URL,
+              DATA_TYPE,
+              COVERAGE_TYPE,
+              SORT,
+              del_flag,
+              revision,
+              'APP_USER',
+              NOW(),
+              'APP_USER',
+              NOW()
         FROM
             ic_coverage_category_dict
         WHERE
             del_flag = '0'
-        AND customer_id = 'default'
+          AND customer_id = 'default'
     </insert>
 
     <select id="dictMap" resultType="com.epmet.dto.result.IcCoverageCategoryDictListResultDTO">

From e731e686b8788e55cfd2f953e23c2808dab4cc5b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 7 Apr 2023 03:02:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A4=9A=E9=80=89=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97=E9=97=AE=E9=A2=98=E3=80=82=E3=80=82?=
 =?UTF-8?q?=E3=80=82=E3=80=82=E5=A4=B4=E5=8F=91=E6=8E=89=E5=85=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/PidUtils.java   |  27 +++
 .../impl/IcNeighborHoodServiceImpl.java       |  13 +-
 .../java/com/epmet/dao/IcResiUserDao.java     |   5 +-
 .../service/impl/IcResiUserServiceImpl.java   | 170 ++++++++++++------
 .../main/resources/mapper/IcResiUserDao.xml   |  19 +-
 5 files changed, 172 insertions(+), 62 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/PidUtils.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/PidUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/PidUtils.java
new file mode 100644
index 0000000000..f0cdb943b8
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/PidUtils.java
@@ -0,0 +1,27 @@
+package com.epmet.commons.tools.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * pid用到的工具
+ */
+public class PidUtils {
+
+    /**
+     * 将orgId和pids组合传话为orgIdPath(包含自己)
+     * @param orgId
+     * @param pids
+     * @return
+     */
+    public static String convertPid2OrgIdPath(String orgId,String pids) {
+        StringBuilder orgIdPath = new StringBuilder();
+        if (StringUtils.isBlank(pids) || pids.equals("0")) {
+            orgIdPath.append(orgId);
+        } else {
+            orgIdPath.append(pids).append(":").append(orgId);
+        }
+
+        return orgIdPath.toString();
+    }
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 7b863857f9..751abc9199 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -200,11 +200,16 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             }
             agencyId = result.getAgencyId();
         }
+
+        // 此处支持多种条件，or连接
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(agencyId), IcNeighborHoodEntity::getAgencyId, agencyId);
-        wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId);
-        wrapper.in(!CollectionUtils.isEmpty(agencyIds), IcNeighborHoodEntity::getAgencyId, agencyIds);
-        wrapper.in(!CollectionUtils.isEmpty(gridIds), IcNeighborHoodEntity::getGridId, gridIds);
+        wrapper.eq(StringUtils.isNotBlank(agencyId), IcNeighborHoodEntity::getAgencyId, agencyId)
+                .or()
+                .eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId)
+                .or()
+                .in(!CollectionUtils.isEmpty(agencyIds), IcNeighborHoodEntity::getAgencyId, agencyIds)
+                .or()
+                .in(!CollectionUtils.isEmpty(gridIds), IcNeighborHoodEntity::getGridId, gridIds);
         wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
         List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index bb215e3734..7ea3b00fbb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -66,8 +66,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                 @Param("conditions") List<ResiUserQueryValueDTO> conditions,
                                                 @Param("resultColumns") List<IcFormResColumnDTO> resultColumns,
                                                 @Param("subTables") List<String> subTables,
-                                                @Param("currentStaffAgencyId") String currentStaffAgencyId,
-                                                @Param("staffOrgPath") String staffOrgPath,
+                                                @Param("currentStaffAgencyId") List<String> currentStaffAgencyIds,
+                                                @Param("staffOrgPaths") List<String> staffOrgPaths,
+                                                @Param("gridIds") Set<String> gridIds,
                                                 @Param("resultTableName") String resultTableName,
                                                 @Param("keyword") String keyword,
                                                 @Param("groupByTables") Set<String> groupByTables);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index ce0ae4cb7f..f5416c714b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -181,7 +181,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Autowired
     private IcVaccineRelationDao icVaccineRelationDao;
 
-
+    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) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -918,36 +918,61 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         List<IcFormResColumnDTO> resultColumns = resultColumnRes.getData();
         // 查询结果列对应的表:
         Set<String> resultColumnTables = resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet());
-        List<String> queryAgencyIdList = formDTO.getConditions().stream()
-                .filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName())
-                        && CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO)))
-                .flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList());
+
+        // List<String> queryAgencyIdList = formDTO.getConditions().stream()
+        //         .filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_IDS".equals(o.getColumnName())
+        //                 && CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO)))
+        //         .flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList());
+
+        // 组织和网格单独处理
+        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))) {
+                if ("AGENCY_IDS".equals(c.getColumnName())) {
+                    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())) {
+                    queryAgencyIdList.addAll(c.getColumnValue());
+                } else if ("GRID_ID".equals(c.getColumnName()) && ! queryGridIdList.contains(c.getColumnValue())) {
+                    queryGridIdList.addAll(c.getColumnValue());
+                }
+            }
+        });
+
+        // 移除需要特殊处理的conditions
+        formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && ORG_FIELDS.contains(o.getColumnName()));
 
         //添加数据权限
-        String staffOrgPath;
-        String agencyId;
-        //如果查询条件中 有居民表的agencyId 则匹配查询该组织下的 数据
-        if (queryAgencyIdList.isEmpty()){
+        List<String> staffOrgPaths;
+        List<String> agencyIds = null;
+        //如果查询条件中 没有有居民表的agencyId,则查询该工作人员所属组织的信息
+        if (queryAgencyIdList.isEmpty() && queryGridIdList.isEmpty()){
             CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-            agencyId = staffInfoCacheResult.getAgencyId();
+            agencyIds = Arrays.asList(staffInfoCacheResult.getAgencyId());
+
+            String op;
             if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-                staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
+                op = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
             } else {
-                staffOrgPath = staffInfoCacheResult.getAgencyId();
+                op = staffInfoCacheResult.getAgencyId();
             }
+
+            staffOrgPaths = Arrays.asList(op);
         } else {
-            formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()));
-            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO));
-            if (agencyInfo == null){
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败");
-            }
-            agencyId = agencyInfo.getId();
-            staffOrgPath = agencyInfo.getPids();
-            if (StringUtils.isBlank(staffOrgPath)){
-                staffOrgPath = agencyId;
-            }else{
-                staffOrgPath = staffOrgPath+StrConstant.COLON+agencyInfo.getId();
-            }
+            // 将组织id列表，转化为组织orgIdPath列表
+            staffOrgPaths = queryAgencyIdList.stream().map(agId -> {
+                AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agId);
+                if (agencyInfo == null) {
+                    String errorMsg = "查询机关单位失败:" + agId;
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                }
+                return PidUtils.convertPid2OrgIdPath(agId, agencyInfo.getPids());
+            }).collect(Collectors.toList());
         }
         // 查询列表展示项需要用到哪些子表
         Result<List<SubTableJoinDTO>> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO1);
@@ -976,14 +1001,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         PageInfo<Map<String, Object>> pageInfo = new PageInfo<>();
         if (null == formDTO.getIsPage() || formDTO.getIsPage()) {
             //分页
-            String finalStaffOrgPath = staffOrgPath;
+            List<String> finalStaffOrgPath = staffOrgPaths;
+            List<String> finalAgencyIds = agencyIds;
             pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                     formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
                     finalSubTables,
-                    agencyId, finalStaffOrgPath,null, formDTO.getKeyword(),
+                    finalAgencyIds,
+                    finalStaffOrgPath,
+                    queryGridIdList,
+                    null,
+                    formDTO.getKeyword(),
                     groupByTables));
         } else {
             List<Map<String, Object>> list = baseDao.selectListResiMap(formDTO.getCustomerId(),
@@ -991,8 +1021,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getConditions(),
                     resultColumns,
                     finalSubTables,
-                    agencyId,
-                    staffOrgPath,null,
+                    agencyIds,
+                    staffOrgPaths,
+                    queryGridIdList,
+                    null,
                     formDTO.getKeyword(),
                     groupByTables);
             pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size());
@@ -3320,37 +3352,58 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         List<IcFormResColumnDTO> resultColumns = resultColumnRes.getData();
         // 查询结果列对应的表:
         Set<String> resultColumnTables = resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet());
-        List<String> queryAgencyIdList = formDTO.getConditions().stream()
-                .filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName())
-                        && CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO)))
-                .flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList());
+
+        // 组织和网格单独处理
+        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))) {
+                if ("AGENCY_IDS".equals(c.getColumnName())) {
+                    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())) {
+                    queryAgencyIdList.addAll(c.getColumnValue());
+                } else if ("GRID_ID".equals(c.getColumnName()) && ! queryGridIdList.contains(c.getColumnValue())) {
+                    queryGridIdList.addAll(c.getColumnValue());
+                }
+            }
+        });
+
+        // 移除需要特殊处理的conditions
+        formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && ORG_FIELDS.contains(o.getColumnName()));
 
         //添加数据权限
-        String staffOrgPath;
-        String agencyId;
-        //如果查询条件中 有居民表的agencyId 则匹配查询该组织下的 数据
-        if (queryAgencyIdList.isEmpty()){
+        List<String> staffOrgPaths;
+        List<String> agencyIds = null;
+        //如果查询条件中 没有有居民表的agencyId,则查询该工作人员所属组织的信息
+        if (queryAgencyIdList.isEmpty() && queryGridIdList.isEmpty()){
             CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-            agencyId = staffInfoCacheResult.getAgencyId();
+            agencyIds = Arrays.asList(staffInfoCacheResult.getAgencyId());
+
+            String op;
             if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-                staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
+                op = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
             } else {
-                staffOrgPath = staffInfoCacheResult.getAgencyId();
+                op = staffInfoCacheResult.getAgencyId();
             }
+
+            staffOrgPaths = Arrays.asList(op);
         } else {
-            formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()));
-            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO));
-            if (agencyInfo == null){
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败");
-            }
-            agencyId = agencyInfo.getId();
-            staffOrgPath = agencyInfo.getPids();
-            if (StringUtils.isBlank(staffOrgPath)){
-                staffOrgPath = agencyId;
-            }else{
-                staffOrgPath = staffOrgPath+StrConstant.COLON+agencyInfo.getId();
-            }
+            // 将组织id列表，转化为组织orgIdPath列表
+            staffOrgPaths = queryAgencyIdList.stream().map(agId -> {
+                AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agId);
+                if (agencyInfo == null) {
+                    String errorMsg = "查询机关单位失败:" + agId;
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                }
+                return PidUtils.convertPid2OrgIdPath(agId, agencyInfo.getPids());
+            }).collect(Collectors.toList());
         }
+
         // 查询列表展示项需要用到哪些子表
         Result<List<SubTableJoinDTO>> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO1);
         List<SubTableJoinDTO> subTables = subTablesRes.getData();
@@ -3378,14 +3431,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         PageInfo<Map<String, Object>> pageInfo = new PageInfo<>();
         if (null == formDTO.getIsPage() || formDTO.getIsPage()) {
             //分页
-            String finalStaffOrgPath = staffOrgPath;
+            List<String> finalStaffOrgPath = staffOrgPaths;
+            List<String> finalAgencyIds = agencyIds;
             pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                     formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
                     finalSubTables,
-                    agencyId, finalStaffOrgPath,null, formDTO.getKeyword(),
+                    finalAgencyIds,
+                    finalStaffOrgPath,
+                    queryGridIdList,
+                    null,
+                    formDTO.getKeyword(),
                     groupByTables));
         } else {
             List<Map<String, Object>> list = baseDao.selectListResiMap(formDTO.getCustomerId(),
@@ -3393,8 +3451,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getConditions(),
                     resultColumns,
                     finalSubTables,
-                    agencyId,
-                    staffOrgPath,null,
+                    agencyIds,
+                    staffOrgPaths,
+                    queryGridIdList,
+                    null,
                     formDTO.getKeyword(),
                     groupByTables);
             pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size());
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index f958ee2ce9..2d2e30535f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -90,7 +90,24 @@
         <if test="resultTableName != null and resultTableName != ''">
             AND ${resultTableName}.ID IS NOT NULL
         </if>
-        and ic_resi_user.pids like concat(#{staffOrgPath},'%')
+        <!-- orgIdPath过滤 -->
+        and (
+            <foreach collection="staffOrgPaths" item="orgIdPath" separator="or">
+                ic_resi_user.pids like concat(#{orgIdPath},'%')
+            </foreach>
+            <if test='staffOrgPaths != null and staffOrgPaths.size() > 0 and gridIds != null and gridIds.size() > 0'>
+                or
+            </if>
+            <!-- 网格id过滤 -->
+            <if test="gridIds != null and gridIds.size() > 0">
+                ic_resi_user.GRID_ID in (
+                <foreach collection="gridIds" item="gridId" separator=",">
+                    #{gridId}
+                </foreach>
+                )
+            </if>
+        )
+
         <if test="null != conditions and conditions.size() > 0">
             <foreach item="subCondition" collection="conditions" open="" separator="" close="">
                 <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">

From 2f2287033785bbb1f4e6e9959285bef454346f0f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 7 Apr 2023 10:00:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=99=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=8D=E9=87=8D=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index f5416c714b..d8e5ea3c17 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/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;
-            if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-                op = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
-            } else {
-                op = staffInfoCacheResult.getAgencyId();
-            }
-
+            String op = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds());
             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;
-            if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-                op = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
-            } else {
-                op = staffInfoCacheResult.getAgencyId();
-            }
-
+            String op = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds());
             staffOrgPaths = Arrays.asList(op);
         } else {
             // 将组织id列表，转化为组织orgIdPath列表