Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

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<String> 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<String,Integer> 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);
                     }
                 });
             });