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 73e09f65..a7f444ff 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 @@ -542,7 +542,7 @@ public class ProcessProjectStandardService extends ServiceImpl variables = new HashMap<>(); variables.put(ProcessProjectStandardCommon.PASS, pass); - if (!pass){ + List designEngineerList; + if (pass){ + designEngineerList = updateTermList.stream() + .map(ProcessProjectStandardTerm::getDesignEngineer) + .distinct() + .collect(Collectors.toList()); + }else { LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(ProcessProjectStandardTermUser::getProcessId, businessId); wrapper1.isNotNull(ProcessProjectStandardTermUser::getResponsibleUnitLeader); List termUserList = termUserService.list(wrapper1); - List designEngineerList = termUserList.stream() + designEngineerList = termUserList.stream() .map(ProcessProjectStandardTermUser::getResponsibleUnitLeader) .distinct() .collect(Collectors.toList()); - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList); - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size()); } - + variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList); + variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size()); taskService.complete(taskId, variables); if (pass){ //发送消息