From 81ec30d0c81a9e594c511815a68c1db1b147ab4e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 2 Dec 2020 14:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AE=AE=E9=A2=98-=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=AE=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/service/impl/GroupIssueServiceImpl.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
index 669f1a2edb..cb5852ebfd 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -174,6 +175,9 @@ public class GroupIssueServiceImpl implements GroupIssueService {
     public List<GroupVotingListResultDTO> votingList(AllIssueFormDTO formDTO) {
         //查找小组内所有话题ID
         List<String> topicIds =  resiTopicService.getTopicIdsByGroup(formDTO.getGroupId());
+        if (CollectionUtils.isEmpty(topicIds)) {
+            return Collections.emptyList();
+        }
         formDTO.setTopicIds(topicIds);
         Result<List<GroupVotingListResultDTO>> result =  govIssueOpenFeignClient.getVotingListByGroup(formDTO);
         if(!result.success()) {
@@ -194,6 +198,9 @@ public class GroupIssueServiceImpl implements GroupIssueService {
     public List<GroupShiftProjectListResultDTO> shiftProjectList(AllIssueFormDTO formDTO) {
         //查找小组内所有话题ID
         List<String> topicIds =  resiTopicService.getTopicIdsByGroup(formDTO.getGroupId());
+        if (CollectionUtils.isEmpty(topicIds)) {
+            return Collections.emptyList();
+        }
         formDTO.setTopicIds(topicIds);
         Result<List<GroupShiftProjectListResultDTO>> result =  govIssueOpenFeignClient.getShiftProjectListByGroup(formDTO);
         if(!result.success()) {
@@ -214,6 +221,9 @@ public class GroupIssueServiceImpl implements GroupIssueService {
     public List<GroupClosedListResultDTO> closedList(AllIssueFormDTO formDTO) {
         //查找小组内所有话题ID
         List<String> topicIds =  resiTopicService.getTopicIdsByGroup(formDTO.getGroupId());
+        if (CollectionUtils.isEmpty(topicIds)) {
+            return Collections.emptyList();
+        }
         formDTO.setTopicIds(topicIds);
         Result<List<GroupClosedListResultDTO>> result =  govIssueOpenFeignClient.getClosedListByGroup(formDTO);
         if(!result.success()) {