小组议题-全部议题修改

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()) {