【双实录入】统计相关接口问题修改

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;
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2584,6 +2584,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Override
     public Map<String, Integer> getIcUserCount(IcUserCountFormDTO formDTO) {
         List<IcUserCountResultDTO> list =  baseDao.getIcUserCount(formDTO);
+        list = list.stream().filter(item -> null != item.getId()).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyMap();
         }