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);