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 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 wrapper = new LambdaQueryWrapper<>(); @@ -550,9 +539,17 @@ public class ProcessProjectStandardService extends ServiceImpl 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 processInfoVO, ProcessDTO processDTO, boolean pass, boolean hasParent) {