From be2e126cc1d8fcf556b2c2e557cd6415c1f4e777 Mon Sep 17 00:00:00 2001
From: wxz <wxz@163.com>
Date: Tue, 9 Jan 2024 13:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B=E5=90=A7?=
 =?UTF-8?q?=EF=BC=8C=E7=9C=9F=E6=85=A2=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcHouseServiceImpl.java    | 7 +++++++
 .../src/main/java/com/epmet/dao/IcResiUserDao.java         | 2 +-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 ++-
 .../src/main/resources/mapper/IcResiUserDao.xml            | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 0ab38c3e96..f3004c3df3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -146,6 +146,13 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         }
 
         // 查db
+
+        if (StringUtils.isBlank(formDTO.getBuildingId()) && StringUtils.isNotBlank(formDTO.getUnitId())) {
+            // 如果有unitId但是没有BuildingId，为了走联合索引，先查出来BuildingId
+            IcBuildingUnitEntity unitEtt = buildingUnitDao.selectById(formDTO.getUnitId());
+            formDTO.setBuildingId(unitEtt.getBuildingId());
+        }
+
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
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 af42985a6b..c101f57c78 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
@@ -277,7 +277,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     Map<String, String> selectResiInfoMap(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("resiId") String resiId);
 
-    List<Map<String, Object>> selectResiUsers(@Param("types") List<String> types, @Param("orgId") String orgId);
+    List<Map<String, Object>> selectResiUsers(@Param("types") List<String> types, @Param("orgId") String orgId, @Param("agencyPids") String agencyPids);
 
     List<String> icUserCustomerIds();
 
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 8bdb2366a7..2348a205cd 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
@@ -1815,7 +1815,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             configList = configListOrigin;
         }
         List<CustomerCategoryShowAndWarnListResultDTO> finalConfigList = configList;
-        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(finalConfigList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId()));
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(finalConfigList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId(), agencyInfo.getPids()));
         List<Map<String, Object>> list = pageInfo.getList();
         if (CollectionUtils.isEmpty(list)) {
             return result;
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 6337e2ff04..5f43baa39f 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
@@ -846,7 +846,7 @@
         FROM ic_resi_user
         WHERE DEL_FLAG = 0
           AND STATUS = '0'
-          AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
+          AND (PIDS LIKE CONCAT(#{agencyPids}, '%') or AGENCY_ID = #{orgId})
           AND(
           <foreach collection="types" item="t" separator="OR">
               (${t} IS NOT NULL AND ${t} != 0)