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 ddc2431afd..79f3f82e5b 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 @@ -604,14 +604,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } PageData houseData = this.getHouseList(formDTO); - List resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class); List resultList = new ArrayList<>(); PageData 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){