|
|
@@ -516,6 +516,19 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
|
|
|
}
|
|
|
objectListVo.setExecuterCount(currentExecuterList.size());
|
|
|
objectListVo.setExecuterList(currentExecuterList);
|
|
|
+
|
|
|
+
|
|
|
+ Set<String> collect = currentExecuterList.stream().map(EvaluateExecuterVo::getExecuterId).collect(Collectors.toSet());
|
|
|
+ List<EvaluateExecuterVo> notExecuterList = new ArrayList<>();
|
|
|
+ List<User> notUserList = userList.stream().filter(x -> !collect.contains(x.getId().toString())).collect(Collectors.toList());
|
|
|
+ for (User user : notUserList) {
|
|
|
+ EvaluateExecuterVo evaluateExecuterVo = new EvaluateExecuterVo();
|
|
|
+ evaluateExecuterVo.setExecuterId(user.getId().toString());
|
|
|
+ evaluateExecuterVo.setEvaluateObjectId(objectListVo.getObjectId());
|
|
|
+ evaluateExecuterVo.setExecuterName(user.getName());
|
|
|
+ notExecuterList.add(evaluateExecuterVo);
|
|
|
+ }
|
|
|
+ objectListVo.setNotExecuterList(notExecuterList);
|
|
|
}
|
|
|
|
|
|
}
|