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 votingList(AllIssueFormDTO formDTO) { //查找小组内所有话题ID List topicIds = resiTopicService.getTopicIdsByGroup(formDTO.getGroupId()); + if (CollectionUtils.isEmpty(topicIds)) { + return Collections.emptyList(); + } formDTO.setTopicIds(topicIds); Result> result = govIssueOpenFeignClient.getVotingListByGroup(formDTO); if(!result.success()) { @@ -194,6 +198,9 @@ public class GroupIssueServiceImpl implements GroupIssueService { public List shiftProjectList(AllIssueFormDTO formDTO) { //查找小组内所有话题ID List topicIds = resiTopicService.getTopicIdsByGroup(formDTO.getGroupId()); + if (CollectionUtils.isEmpty(topicIds)) { + return Collections.emptyList(); + } formDTO.setTopicIds(topicIds); Result> result = govIssueOpenFeignClient.getShiftProjectListByGroup(formDTO); if(!result.success()) { @@ -214,6 +221,9 @@ public class GroupIssueServiceImpl implements GroupIssueService { public List closedList(AllIssueFormDTO formDTO) { //查找小组内所有话题ID List topicIds = resiTopicService.getTopicIdsByGroup(formDTO.getGroupId()); + if (CollectionUtils.isEmpty(topicIds)) { + return Collections.emptyList(); + } formDTO.setTopicIds(topicIds); Result> result = govIssueOpenFeignClient.getClosedListByGroup(formDTO); if(!result.success()) {