From 0437baf980c2024e739d699ccdb30ca1292430ad Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 12 May 2022 10:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/IcHouseListResultDTO.java   | 2 +-
 .../src/main/java/com/epmet/service/impl/HouseServiceImpl.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 93b9b9818e..4c1b40288f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -49,7 +49,7 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String buildingName;
     /**
-     * 单元号
+     * 单元号_单元
      */
     private String unitNum;
     /**
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 eb2e64d1e8..b9ad4c5201 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
@@ -500,14 +500,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
 
         PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO);
-        List<HouseMemberResultDTO> resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class);
 
         List<HouseMemberResultDTO> resultList = new ArrayList<>();
         PageData<HouseMemberResultDTO> result = new PageData<>(resultList,houseData.getList().size());
         int finalSearchLevel = searchLevel;
         AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize());
 
-        resultDTOS.forEach(o ->{
+        houseData.getList().forEach(o ->{
 
             resiParam.setNeighborHoodId(o.getNeighborHoodId());
             if (finalSearchLevel == 1){