From b6d24aab050763ec61933c1dfe4152e03fcb9434 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 24 Nov 2020 17:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=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=B7=B2?= =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98)=E3=80=91=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=9F=A5=E8=AF=A2=E5=88=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/person/service/impl/TopicServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java index a978c0563d..3d8cadd357 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java @@ -58,6 +58,9 @@ public class TopicServiceImpl implements TopicService { } List projects = result.getData(); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(projects)) { + return new ArrayList(); + } List projectTopics = ConvertUtils.sourceToTarget(projects, MyShiftProjectTopicsResultDTO.class); List gridIds = projects.stream().map(p -> p.getGridId()).collect(Collectors.toList()); @@ -67,9 +70,11 @@ public class TopicServiceImpl implements TopicService { logger.error("查询我创建的话题列表(已转项目),根据网格id查询网格名称失败, InternalMsg:{},Msg:{}", rst.getInternalMsg(), rst.getMsg()); } else { List gridInfos = rst.getData(); - HashMap gridIdAndNames = new HashMap<>(); - gridInfos.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName())); - projectTopics.stream().forEach(pt -> pt.setReleaseGridName(gridIdAndNames.get(pt.getGridId()))); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(gridInfos)) { + HashMap gridIdAndNames = new HashMap<>(); + gridInfos.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName())); + projectTopics.stream().forEach(pt -> pt.setReleaseGridName(gridIdAndNames.get(pt.getGridId()))); + } } return projectTopics;