|
|
@ -256,12 +256,12 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
logger.error("查询议题来源网格名称失败......"); |
|
|
|
} |
|
|
|
//查询话题来源小组名称
|
|
|
|
Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); |
|
|
|
List<GroupInfoResultDTO> groupInfoResultDTOS=new ArrayList<>(); |
|
|
|
if (!CollectionUtils.isEmpty(topicIds)){ |
|
|
|
groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); |
|
|
|
Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); |
|
|
|
if (groupNameList.success()&&!CollectionUtils.isEmpty(groupNameList.getData())){ |
|
|
|
groupInfoResultDTOS=groupNameList.getData(); |
|
|
|
} |
|
|
|
if (!groupNameList.success()){ |
|
|
|
logger.error("查询议题来源小组名称失败......"); |
|
|
|
} |
|
|
|
List<MyPubIssuesClosedResultDTO> 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); |
|
|
|
} |
|
|
|