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 ef6c7454..f3904782 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 @@ -491,10 +491,6 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList); } ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); // 完成任务 @@ -555,10 +551,6 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList); } } //模块负责人修改 @@ -619,10 +611,6 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList); } } @@ -880,10 +868,6 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList); } } @@ -966,10 +950,6 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList); } } @@ -1019,9 +999,6 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, userIdList); } } 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 447392f6..dda0c203 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 @@ -483,7 +483,7 @@ public class ProcessProjectStandardService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + private void mkzrrspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { String businessId = processInfoVO.getBusinessId(); ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); String originUserId = processApprovalRecord.getOriginUserId(); @@ -534,10 +534,6 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId); } // 完成任务 @@ -634,10 +630,6 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MANAGER_LEADER,userId); } String taskId = processDTO.getTaskId(); @@ -788,9 +780,6 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.FGGCSSP, userIdList); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.STANDARDS_ENGINEER,userId); } taskService.complete(taskId, variables); @@ -891,10 +880,6 @@ 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); } variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerIds); variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size()); @@ -976,10 +961,6 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRFF_1, userIdList); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRSP_1, userIdList); } ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); // 完成任务 @@ -1021,9 +1002,6 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, userIdList); } // 完成任务 String taskId = processDTO.getTaskId();