From f07e1656ca3b607ea2a036bd6cc82bd105d4e1b6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 22 Dec 2023 13:50:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=94=AF=E6=8C=81=E9=A9=B3=E5=9B=9E=E5=90=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=B5=81=E7=A8=8B=E9=80=89=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAbolishServiceImpl.java     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
index af2b16be..010aaa15 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
@@ -25,7 +25,9 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,6 +57,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
     @Resource
     private IProcessHandleService processHandleService;
 
+    @Resource
+    private TaskService taskService;
+
     @Override
     public void startProcess(ESAbolishDataVO abolishData) {
         // 执行流程发起前的操作
@@ -166,10 +171,26 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         String userId = UserUtils.getUserId();
         CommonVO commonVO = abolishData.getCommon();
         String taskId = commonVO.getTaskId();
+        Map<String, Object> flowUser = abolishData.getFlowUser();
+        // 获取流程实例ID
+        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        // 获取流程实例对象
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
+                .processInstanceId(processInstanceId).singleResult();
+        // 获取流程定义ID
+        String processDefinitionId = processInstance.getProcessDefinitionId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
-        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        if (flowUser != null) {
+            Map<String, Object> variables = setVariables(flowUser);
+            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+            // 获取执行id
+            String executionId = task.getExecutionId();
+            // 设置流程变量
+            runtimeService.setVariables(executionId, variables);
+            processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(flowUser));
+        }
         // 设置流程变量
         runtimeService.setVariable(processInstanceId, "pass", pass);
         // 更新审批表为完成，填充数据