From 358a16b9cccd20ea3ef7ae4c28bf8bcf6f0b3fd3 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 26 Nov 2020 10:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90=E6=88=91?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/impl/ResiTopicServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index ccfdeb72d3..c650b18fe5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1470,20 +1470,23 @@ public class ResiTopicServiceImpl extends BaseServiceImpl gridIdAndNames = new HashMap<>(); List gridIds = myTopics.stream().map(c -> c.getReleaseGridId()).collect(Collectors.toList()); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(gridIds)) { + return myTopics; + } + Result> gridsResult = govOrgOpenFeignClient.getGridListByGridIds(gridIds); if (gridsResult.success()) { List grids = gridsResult.getData(); if (grids != null && grids.size() != 0) { grids.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName())); + for (MyCreateTopicsResultDTO myTopic : myTopics) { + myTopic.setReleaseGridName(gridIdAndNames.get(myTopic.getReleaseGridId())); + } } } else { log.error("【我创建的话题列表】，查询组织-网格名称出错，没有抛出，内部处理。内部消息:{},外部消息:{}", gridsResult.getInternalMsg(), gridsResult.getMsg()); } - for (MyCreateTopicsResultDTO myTopic : myTopics) { - myTopic.setReleaseGridName(gridIdAndNames.get(myTopic.getReleaseGridId())); - } - return myTopics; }