From b76b9296f1275fb16f5eb3dfd663d8207860355d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Feb 2024 10:37:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081673=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-=E9=83=A8?= =?UTF-8?q?=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=88=86?= =?UTF-8?q?=E5=8F=91=E8=8A=82=E7=82=B9=E6=9C=89=E8=BD=AC=E5=8A=9E=EF=BC=8C?= =?UTF-8?q?=E5=88=B0=E9=83=A8=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86?= =?UTF-8?q?=E5=AF=BC=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E4=BB=8D=E7=BB=99?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E4=BA=BA=E4=BA=86=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=9B=9E=E6=98=BE=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ProcessProjectStandardCommon.java | 1 + .../service/ProcessProjectStandardService.java | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java index 1954b215..59e31d52 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java @@ -8,6 +8,7 @@ public class ProcessProjectStandardCommon { public static final String PASS = "pass"; 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 MANAGER_LEADER_LIST_SIZE = "managerLeaderListSize"; public static final String MODULE_OWNER_LIST = "moduleOwnerList"; 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 e746401f..a5b339cb 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 @@ -828,16 +828,18 @@ public class ProcessProjectStandardService extends ServiceImpl variables = new HashMap<>(); if (!Objects.equals(userId,originUserId)){ + variables.put(ProcessProjectStandardCommon.MANAGER_LEADER,userId); List userIdList = new ArrayList<>(); userIdList.add(userId); processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); } - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerIds); variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size()); taskService.complete(taskId, variables);