From b57e2dba80002f19ceb039fbaeb9e0da8a64370f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Oct 2022 09:46:40 +0800 Subject: [PATCH] =?UTF-8?q?/resi/group/group/groupinfo+/resi/mine/issue/my?= =?UTF-8?q?-pub-issues/closed=E6=88=91=E5=8F=91=E8=B5=B7=E7=9A=84=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=B7=B2=E5=85=B3=E9=97=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/impl/ResiGroupServiceImpl.java | 3 +++ .../person/service/impl/IssueServiceImpl.java | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 493d176a07..72fbd03444 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1272,6 +1272,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) { + if(CollectionUtils.isEmpty(groupInfoFormDTO.getTopicIds())){ + return new ArrayList<>(); + } return baseDao.selectGroupInfo(groupInfoFormDTO.getTopicIds()); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java index 515c9a7b6b..7dd49f2afc 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java @@ -256,12 +256,12 @@ public class IssueServiceImpl implements IssueService { logger.error("查询议题来源网格名称失败......"); } //查询话题来源小组名称 - Result> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); + List groupInfoResultDTOS=new ArrayList<>(); if (!CollectionUtils.isEmpty(topicIds)){ - groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); - } - if (!groupNameList.success()){ - logger.error("查询议题来源小组名称失败......"); + Result> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); + if (groupNameList.success()&&!CollectionUtils.isEmpty(groupNameList.getData())){ + groupInfoResultDTOS=groupNameList.getData(); + } } List resultDTOList=new ArrayList<>(); for(IssueDTO issueDTO:issueResult.getData()){ @@ -275,8 +275,8 @@ public class IssueServiceImpl implements IssueService { if (!CollectionUtils.isEmpty(gridNameList.getData())){ gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName())); } - if (!CollectionUtils.isEmpty(groupNameList.getData())){ - groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName())); + if (!CollectionUtils.isEmpty(groupInfoResultDTOS)){ + groupInfoResultDTOS.stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName())); } resultDTOList.add(resultDTO); }