From 3232517d20f1b8f17d9e7b27b593cc9c612dd957 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 19 Dec 2023 14:05:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=B9=E6=8D=AEmodel=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/service/ProcessNodeService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index ec6fcc46..f740b611 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -75,24 +75,24 @@ public class ProcessNodeService extends ServiceImpl nodeNameList = oldNodeList.stream() - .map(ProcessNode::getNodeName).distinct().collect(Collectors.toList()); + List nodeIdList = oldNodeList.stream() + .map(ProcessNode::getXmlNodeId).distinct().collect(Collectors.toList()); // 给前端展示的节点 List viewNodeList = oldNodeList.stream() .filter(node -> node.getIsView() == 1).collect(Collectors.toList()); - Map map = CollStreamUtil.toMap(processNodeList, ProcessNode::getNodeName, ProcessNode::getXmlNodeId); + Map map = CollStreamUtil.toMap(processNodeList, ProcessNode::getXmlNodeId, ProcessNode::getNodeName); viewNodeList.forEach(viewNode -> { viewNode.setProcessDefinitionId(processDefinitionId); viewNode.setId(null); - if (map.containsKey(viewNode.getNodeName())){ - viewNode.setXmlNodeId(map.get(viewNode.getNodeName())); + if (map.containsKey(viewNode.getXmlNodeId())){ + viewNode.setNodeName(map.get(viewNode.getXmlNodeId())); } }); for (ProcessNode processNode : processNodeList) { // 如果旧列表里面不存在这个名字，即为新增节点 - if (!nodeNameList.contains(processNode.getNodeName())) { + if (!nodeIdList.contains(processNode.getXmlNodeId())) { viewNodeList.add(processNode); } }