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 f58d8155..7efc4ce2 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 @@ -168,6 +168,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl workGroupUserList = StrUtil.split(workGroupUsers, ','); // 设置流程变量 taskService.setVariable(taskId, "workGroupUserList", workGroupUserList); + // 将联络人主管级上一级领导保存到流程变量中 + taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader); } else { // 保存联络人主管级上级领导 dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); @@ -187,11 +189,13 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl data.setContactUser(contactUser)); dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setProcessInstanceId(processInstanceId)); // 保存收集联络人主管级领导 dataList.forEach(data -> data.setCollectUserLeader(collectUserLeader)); + dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); dataList.forEach(data -> data.setWorkGroupUser(workGroupUser)); saveBatch(dataList); // 设置下一个节点的审批人流程变量 @@ -202,8 +206,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl data.setExecutionId(executionId)); dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);