|
|
@ -1471,7 +1471,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
new OrgInfoFormDTO(OrgInfoConstant.GRID,result.stream().map(ParticipatedTopicUnitResultDTO :: getTopicReleaseGridName).distinct().collect(Collectors.toList()))); |
|
|
|
if(gridR.success() && !CollectionUtils.isEmpty(gridR.getData())){ |
|
|
|
return result.stream().flatMap(topic -> gridR.getData().stream() .filter(grid -> StringUtils.equals(grid.getOrgId(),topic.getTopicReleaseGridName())).map(orgInfo -> { |
|
|
|
topic.setTopicReleaseGridName(orgInfo.getOrgId()); |
|
|
|
topic.setTopicReleaseGridName(orgInfo.getOrgName()); |
|
|
|
return topic; |
|
|
|
})).collect(Collectors.toList()); |
|
|
|
} return Collections.EMPTY_LIST; |
|
|
|