diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java index 804c884998..acee7bda4a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java @@ -200,12 +200,14 @@ public class IssueExtractServiceImpl implements IssueExtractService { // 4. 动作操作人的身份标识是否是党员 List userIds = listResult.stream().map(issue -> issue.getUserId()).distinct().collect(Collectors.toList()); + userIds.addAll(voteInfoList.stream().map(issue -> issue.getUserId()).distinct().collect(Collectors.toList())); + userIds.addAll(satisfactionInfoList.stream().map(issue -> issue.getUserId()).distinct().collect(Collectors.toList())); Map map = userService.selectUserIsParty(userIds); if (null != map){ result.forEach(r -> { map.forEach((userId,isParty) -> { if (r.getOperationUserId().equals(userId)){ - r.setIsParty(isParty); + r.setIsParty(isParty == null ? NumConstant.ZERO : isParty); } }); });