优化一下吧，真慢。。。

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());

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();
 

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;

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)