From 0e294bf607407cb34a6c252ff4d0d564ee96943f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 5 Feb 2024 19:54:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081549=20=E4=BC=81=E6=A0=87=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E8=AF=95=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8F=91=E8=B5=B7=E5=A4=8D=E5=AE=A1=E3=80=81?=
 =?UTF-8?q?=E4=B8=89=E5=B9=B4=E5=AE=9A=E6=97=B6=E5=8F=91=E8=B5=B7=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=EF=BC=8C=E4=B8=A4=E4=B8=AA=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsRecheckServiceImpl.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index 41107923..63e8a87d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -133,7 +133,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         String standardizationUserId = (String) variables.get("standardizationUser");
         String userId = StrUtil.isNotBlank(standardizationUserId) ? standardizationUserId : standardEngineerId;
         // 设置流程变量
-        Map<String, Object> actVariables = this.setVariables(variables);
+        Map<String, Object> actVariables = this.setVariablesAutoStart(variables);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID
@@ -171,6 +171,16 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         return actVariables;
     }
 
+    public Map<String, Object> setVariablesAutoStart(Map<String, Object> flowUser) {
+        Map<String, Object> actVariables = new HashMap<>();
+        for (Map.Entry<String, Object> entry : flowUser.entrySet()) {
+            String key = entry.getKey();
+            actFlowCommonService.putIfNotNull(actVariables, key, entry.getValue());
+            actVariables.put(key, entry.getValue());
+        }
+        return actVariables;
+    }
+
     private Map<String, Object> getUserMap(Map<String, Object> variables) {
         variables.remove("pass");
         return variables;