From 53ac1771a69dc57fb7ac57c4d4dbeccdee42f277 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 4 Feb 2024 09:59:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081734=20=E6=B3=95=E8=A7=84=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=B4=A3=E4=BB=BB=E4=BA=BA=E8=AF=84=E5=AE=A1=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=9C=89=E8=BD=AC=E5=8A=9E=E6=83=85=E5=86=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessProjectStandardService.java        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 8c5914e4..447392f6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -519,17 +519,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 .distinct()
                 .collect(Collectors.toList());
 
-        // 完成任务
-        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
-        String taskId = processDTO.getTaskId();
-        Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectStandardCommon.PASS, pass);
-        if (!pass){
-            variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
-        }
-        taskService.complete(taskId, variables);
-        ThreadLocalUtil.remove();
-
         if (!Objects.equals(userId,originUserId)){
             //更新数据
             LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>();
@@ -550,9 +539,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
             processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
             runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId);
-
         }
-
+        // 完成任务
+        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
+        String taskId = processDTO.getTaskId();
+        Map<String, Object> variables = new HashMap<>();
+        variables.put(ProcessProjectStandardCommon.PASS, pass);
+        if (!pass){
+            variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
+        }
+        taskService.complete(taskId, variables);
+        ThreadLocalUtil.remove();
     }
     //部所主管级领导审批
     private void bszgjldspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass, boolean hasParent) {