From b420334db021f7a983d28ad51c66f363c7417405 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 12 Dec 2023 16:17:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=95=A5=E5=BE=AE=E4=BF=AE=E6=94=B9Mo?=
 =?UTF-8?q?delNode=E7=9A=84=E7=B1=BB=E5=9E=8B=E7=94=9F=E6=88=90=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessModelNodeService.java        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
index 16625418..92cc97a2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
@@ -12,6 +12,7 @@ import com.jero.modules.activiti.enums.VariableTypeEnum;
 import com.jero.modules.activiti.listener.CompleteListener;
 import com.jero.modules.activiti.listener.CreateListener;
 import com.jero.modules.activiti.vo.AddTaskVO;
+import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.bpmn.BpmnAutoLayout;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
@@ -48,7 +49,11 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
     @Resource
     private ProcessModelNodeMapper processModelNodeMapper;
     public static Integer sort = 1;
+    public static List<String> multiInstanceElementVariableList = new ArrayList<>();
+    @Synchronized
     public void generateNode(String modelId) {
+        sort = 1;
+        multiInstanceElementVariableList = new ArrayList<>();
         ObjectNode objectNode = null;
         try {
             objectNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelId));
@@ -377,8 +382,13 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
                     processModelNode.setVariableType(VariableTypeEnum.LIST.getName());
                     processModelNode.setVariableName(inputDataItem.replace("${","").replace("}",""));
                 }else {
-                    processModelNode.setVariableType(VariableTypeEnum.STRING.getName());
-                    processModelNode.setVariableName(assignee.replace("${","").replace("}",""));
+                    String replace = assignee.replace("${", "").replace("}", "");
+                    processModelNode.setVariableName(replace);
+                    if (multiInstanceElementVariableList.contains(replace)) {
+                        processModelNode.setVariableType(VariableTypeEnum.LIST.getName());
+                    }else {
+                        processModelNode.setVariableType(VariableTypeEnum.STRING.getName());
+                    }
                 }
                 processModelNode.setSort(sort++);
             } else if (flowElement instanceof SequenceFlow) {
@@ -399,6 +409,9 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
 
             } else if (flowElement instanceof SubProcess) {
                 SubProcess subProcess = (SubProcess) flowElement;
+                MultiInstanceLoopCharacteristics loopCharacteristics = subProcess.getLoopCharacteristics();
+                String elementVariable = loopCharacteristics.getElementVariable();
+                multiInstanceElementVariableList.add(elementVariable);
                 Collection<FlowElement> flowElements1 = subProcess.getFlowElements();
                 xmlNodeId = subProcess.getId();
                 List<ProcessModelNode> processModelNodes = handlerLawsProcessModelNode(flowElements1, gatewayIdList, modelId, xmlNodeId);