From b026e643f1f39bf0b93ecee6257a77d2c19c6088 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 31 Oct 2023 18:20:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 7d59cfd9..9137b5ef 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
@@ -194,6 +194,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         String userId = UserUtils.getUserId();
         CommonVO commonVO = initChangeDataVO.getCommonVO();
         List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
+        InitChangeFlowUserVO flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
@@ -201,12 +202,17 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         if (pass) {
-            if (initChangeList != null) {
+            if (initChangeList != null && flowUserInfoVO != null) {
                 saveOrUpdateBatch(initChangeList);
                 Map<String, Object> variables = this.setVariables(initChangeDataVO);
                 processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
                 actFlowCommonService.setProcessVariables(processInstanceId, variables);
             }
+            if (flowUserInfoVO != null) {
+                Map<String, Object> variables = this.setVariables(initChangeDataVO);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
+                actFlowCommonService.setProcessVariables(processInstanceId, variables);
+            }
             runtimeService.setVariable(processInstanceId, "pass", true);
         } else {
             // 设置流程变量