From c1f59dba16a9988d7050acdf3a0f1cf640e73089 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 30 Jun 2022 15:09:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=8C=E5=AE=9E=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E3=80=91=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/HouseInformationServiceImpl.java | 2 ++ .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java index ddd609fd47..9738c9759d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java @@ -13,6 +13,7 @@ import com.epmet.dto.form.HouseInformationFormDTO; import com.epmet.dto.form.IcUserCountFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; +import com.epmet.enums.BuildingTypeEnums; import com.epmet.enums.HouseRentFlagEnums; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.HouseInformationService; @@ -282,6 +283,7 @@ public class HouseInformationServiceImpl implements HouseInformationService { if (map.containsKey(formDTO.getBuildingId())) { result.setPersonCount(map.get(formDTO.getBuildingId())); } + result.setBuildingType(BuildingTypeEnums.getTypeValue(result.getBuildingType())); return result; } 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 0fb0d6d0ae..4fb6693333 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 @@ -2584,6 +2584,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getIcUserCount(IcUserCountFormDTO formDTO) { List list = baseDao.getIcUserCount(formDTO); + list = list.stream().filter(item -> null != item.getId()).collect(Collectors.toList()); if (CollectionUtils.isEmpty(list)) { return Collections.emptyMap(); }