From 6d7444012f24b64a90fc27fe1b45d0d5086e08d7 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 19 Aug 2021 14:15:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9A=E6=89=8D=E6=94=B9=E9=94=99?= =?UTF-8?q?=E4=BA=86=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ResiEventServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 295c8bb6a1..36a2a43684 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -52,17 +52,17 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve Result> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); List npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); + if(CollectionUtils.isEmpty(npcData)) { + // 没有人大代表，直接返回空列表即可 + return npcResultList; + } + //批量查询人大代表所在的网格信息 List npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList()); OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds); Result> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); List npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); - if(CollectionUtils.isEmpty(npcGridInfos)) { - // 没有人大代表，直接返回空列表即可 - return npcResultList; - } - Map npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); npcData.stream().forEach(npc -> {