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 179094260b..803e47669a 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 @@ -1295,14 +1295,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(idCards)){ - Result> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards); - if (!housesNameByIdCards.success()){ + Set homeIds = list.stream().filter(m -> StringUtils.isNotBlank(m.getIdCard())).map(m -> m.getHomeId()).distinct().collect(Collectors.toSet()); + if (CollectionUtils.isNotEmpty(homeIds)){ + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId()); + if (!houseInfoRes.success()){ throw new EpmetException("查询居民所属房屋失败..."); } - if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){ - list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName()))); + if (CollectionUtils.isNotEmpty(houseInfoRes.getData())){ + list.forEach(l -> houseInfoRes.getData().stream().filter( h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName()))); } } PageInfo pageInfo = new PageInfo<>(list);