diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index afa5070a..f94f69e6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -126,7 +126,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl Arrays.asList(s.split(","))).orElse(null)); - actFlowCommonService.putIfNotNull(map, "copyUser", initChangeFlowUserVO.getCopyUser()); return map; } @@ -175,7 +174,12 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl nodeList = processNodeService.getNodeList(processDefinitionId, processInstanceId); InitChangeFlowUserVO initChangeFlowUserVO = new InitChangeFlowUserVO(); - Map userMap = nodeList.stream().collect(Collectors.toMap(ProcessNode::getVariableName, node -> node)); + Map userMap = nodeList.stream() + .collect(Collectors.groupingBy(ProcessNode::getVariableName)) + .values() + .stream() + .map(nodes -> nodes.get(0)) // 选择每组的第一个元素 + .collect(Collectors.toMap(ProcessNode::getVariableName, node -> node)); Optional.ofNullable(userMap.get("createUser")).ifPresent(node -> initChangeFlowUserVO.setCreateUser(node.getLinkUserIds())); Optional.ofNullable(userMap.get("contactUser")).ifPresent(node -> initChangeFlowUserVO.setContactUser(node.getLinkUserIds())); Optional.ofNullable(userMap.get("standardExpertList")).ifPresent(node -> initChangeFlowUserVO.setStandardExpert(node.getLinkUserIds())); @@ -185,7 +189,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl initChangeFlowUserVO.setNewMainDraftUserLeaderLeader(node.getLinkUserIds())); Optional.ofNullable(userMap.get("newMainDraftUserLeader")).ifPresent(node -> initChangeFlowUserVO.setNewMainDraftUserLeader(node.getLinkUserIds())); Optional.ofNullable(userMap.get("relatedUserList")).ifPresent(node -> initChangeFlowUserVO.setRelatedUser(node.getLinkUserIds())); - Optional.ofNullable(userMap.get("copyUser")).ifPresent(node -> initChangeFlowUserVO.setCopyUser(node.getLinkUserIds())); return initChangeFlowUserVO; } @@ -213,10 +216,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl