From 44bbf2fdd9e8c58e22087933cd07c86898590886 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 4 Feb 2024 15:18:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081739=20=E9=A1=B9=E7=9B=AE=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E5=90=84?=
 =?UTF-8?q?=E9=83=A8=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=8A=82=E7=82=B9=E5=AD=98=E5=9C=A8=E8=BD=AC?=
 =?UTF-8?q?=E5=8A=9E=E6=83=85=E5=86=B5=EF=BC=8C=E5=AE=A1=E6=89=B9=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=BB=99=E4=BA=86=E5=8E=9F=E6=9D=A5=E7=9A=84=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectassess/common/ProcessProjectAssessCommon.java    | 1 +
 .../projectassess/service/ProcessProjectAssessService.java  | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java
index fb24270f..e003a0a0 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java
@@ -6,6 +6,7 @@ package com.jero.modules.activiti.process.projectassess.common;
  */
 public class ProcessProjectAssessCommon {
     public static final String STANDARDS_ENGINEER = "standardsEngineer";
+    public static final String MANAGER_LEADER = "managerLeader";
     public static final String MANAGER_LEADER_LIST = "managerLeaderList";
     public static final String MODULE_OWNER = "moduleOwner";
     public static final String MODULE_OWNER_LIST = "moduleOwnerList";
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index f3904782..73d5a180 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -860,6 +860,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, moduleOwnerIds);
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, moduleOwnerIds);
         ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
+        if (!Objects.equals(userId,originUserId)){
+            runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MANAGER_LEADER,userId);
+        }
         // 完成任务
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
@@ -867,8 +870,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size());
         taskService.complete(taskId, variables);
         ThreadLocalUtil.remove();
-        if (!Objects.equals(userId,originUserId)){
-        }
+
     }
 
     //模块负责人分发