From 2cbe037f9bcb62f63bbdc61a71b9506833a21cf8 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 8 Dec 2023 17:59:01 +0800
Subject: [PATCH] fix bug

---
 .../jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml | 6 ++----
 .../jero/modules/activiti/service/ProcessNodeService.java  | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml
index cfd64646..748a1c83 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml
@@ -9,14 +9,12 @@
         </if>
         from process_node pn
         <if test="processInstanceId != null and processInstanceId != ''">
-            left join process_node_link pnl on pn.id = pnl.process_node_id
+            left join (select * from process_node_link where process_instance_id = #{processInstanceId}) pnl
+            on pn.id = pnl.process_node_id
         </if>
         <where>
             pn.process_definition_id = #{processDefinitionId}
             and pn.is_view = 1
-            <if test="processInstanceId != null and processInstanceId != ''">
-                and pnl.process_instance_id = #{processInstanceId}
-            </if>
         </where>
         <if test="processInstanceId != null and processInstanceId != ''">
             group by pn.id
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 7bf487f6..46ac7821 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
@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.service;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessModelNode;
 import com.jero.modules.activiti.mapper.ProcessModelNodeMapper;
@@ -16,6 +17,7 @@ import com.jero.modules.activiti.entity.ProcessNode;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -79,10 +81,13 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         // 给前端展示的节点
         List<ProcessNode> viewNodeList = oldNodeList.stream()
                 .filter(node -> node.getIsView() == 1).collect(Collectors.toList());
-
+        Map<String, String> map = CollStreamUtil.toMap(processNodeList, ProcessNode::getNodeName, ProcessNode::getXmlNodeId);
         viewNodeList.forEach(viewNode -> {
             viewNode.setProcessDefinitionId(processDefinitionId);
             viewNode.setId(null);
+            if (map.containsKey(viewNode.getNodeName())){
+                viewNode.setXmlNodeId(map.get(viewNode.getNodeName()));
+            }
         });
 
         for (ProcessNode processNode : processNodeList) {