From 6d2661b2c2ec92b9c26bb8571dedf5b7500c251d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 18 May 2022 09:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E6=88=BF=E4=B8=80?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/HouseServiceImpl.java  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 451d9e262d..eda0551555 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -597,19 +597,23 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         resiParam.setCustomerId(tokenDto.getCustomerId());
         resiParam.setAgencyId(formDTO.getAgencyId());
         resiParam.setGridId(formDTO.getGridId());
-        resiParam.setPageSize(NumConstant.ONE_THOUSAND);
+        resiParam.setPageSize(NumConstant.TEN_THOUSAND);
         resiParam.setIsPage(false);
 
-        //查询级别 默认按照小区去查
+        //查询级别 默认按照房屋的组织去查
         int searchLevel = 0;
 
+        //如果小区id不为空 则直接查询小区内的居民
+        if (StringUtils.isNotEmpty(formDTO.getNeighborHoodId())){
+            searchLevel = 1;
+        }
         //如果楼宇id不为空 则直接查询楼宇内的居民
         if (StringUtils.isNotEmpty(formDTO.getBuildingId())){
-            searchLevel = 1;
+            searchLevel = 2;
         }
-        //如果有具体的查询套件 则直接降级为2 按照房屋Id 来查
+        //如果有具体的查询套件 则直接按照房屋Id 来查
         if (StringUtils.isNotEmpty(formDTO.getOwnerName()) || StringUtils.isNotEmpty(formDTO.getOwnerPhone()) || StringUtils.isNotEmpty(formDTO.getRentFlag())){
-            searchLevel = 2;
+            searchLevel = 3;
         }
 
         PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO);
@@ -620,12 +624,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize());
 
         houseData.getList().forEach(o ->{
-
-            resiParam.setNeighborHoodId(o.getNeighborHoodId());
+            resiParam.setAgencyId(o.getAgencyId());
             if (finalSearchLevel == 1){
-                resiParam.setBuildingId(o.getBuildingId());
+                resiParam.setNeighborHoodId(o.getNeighborHoodId());
             }
             if (finalSearchLevel == 2){
+                resiParam.setBuildingId(o.getBuildingId());
+            }
+            if (finalSearchLevel == 3){
                 resiParam.setHouseId(o.getHouseId());
             }
             this.getHouseMembers(resiParam, memberCacheMap,haveSearchCache);