diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 0a572903..e7132d4b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -116,7 +116,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl flowUser = annualReportData.getFlowUser(); actFlowCommonService.putIfNotNull(actVariables, "contactUserList", - Optional.ofNullable((String)flowUser.get("contactUserList")) + Optional.ofNullable((String) flowUser.get("contactUserList")) .map(s -> Arrays.asList(s.split(","))) .orElse(null)); actVariables.put("standardEngineer", flowUser.get("standardEngineer")); @@ -151,17 +151,19 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl workGroupUserList = StrUtil.split(workGroupUsers, ','); // 设置流程变量 taskService.setVariableLocal(taskId, "workGroupUserList", workGroupUserList); - }else { - String contactUserLeaderLeader = (String)flowUserVO.get("contactUserLeaderLeader"); + taskService.setVariableLocal(taskId, "contactUserLeaderLeader", contactUserLeaderLeader); + } else { // 保存联络人主管级上级领导 dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); // 不分发,入库存表 @@ -174,7 +176,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl data.setContactUser(contactUser)); // 保存收集联络人主管级领导 - dataList.forEach(data -> data.setCollectUserLeader((String)flowUserVO.get("collectUserLeader"))); + dataList.forEach(data -> data.setCollectUserLeader((String) flowUserVO.get("collectUserLeader"))); dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId())); saveBatch(dataList); // 设置下一个节点的审批人流程变量