From e3414dc9469b8320a052f91fd4ce367e09f4ecf0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 30 Oct 2023 17:08:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=90=8E=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 3f4c6fc2..91f73458 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
@@ -191,6 +191,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = initChangeDataVO.getCommonVO();
+        List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
@@ -198,11 +199,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         if (pass) {
-            InitChangeFlowUserVO flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
-            if (flowUserInfoVO != null) {
-                Map<String, Object> userMap = new HashMap<>(this.setUserVariables(flowUserInfoVO));
-                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
-                Map<String, Object> variables = setUserVariables(flowUserInfoVO);
+            if (initChangeList != null) {
+                saveOrUpdateBatch(initChangeList);
+                Map<String, Object> variables = this.setVariables(initChangeDataVO);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
                 actFlowCommonService.setProcessVariables(processInstanceId, variables);
             }
             runtimeService.setVariable(processInstanceId, "pass", true);