diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 46afe313..0febb8a9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -124,6 +124,7 @@ public class EsRevisionServiceImpl extends ServiceImpl flowUser = revisionData.getFlowUser(); ProcessEsRevision data = revisionData.getData(); actVariables.put("mainDraftUser", flowUser.get("mainDraftUser")); + actVariables.put("standardizationUser", flowUser.get("standardizationUser")); List otherDraftUserVOS = data.getOtherDraftUserVOS(); if (otherDraftUserVOS == null || otherDraftUserVOS.isEmpty()) { actVariables.put("distribute", false); @@ -276,10 +277,12 @@ public class EsRevisionServiceImpl extends ServiceImpl userMap = new HashMap<>(); List advices; ProcessEsRevision data; + Map flowUser; switch (xmlNodeId) { case MAIN_DRAFT_USER_DISTRIBUTE: // 判断是否分发 设置流程变量 data = revisionData.getData(); + flowUser = revisionData.getFlowUser(); List otherDraftUserVOS = data.getOtherDraftUserVOS(); if (otherDraftUserVOS == null || otherDraftUserVOS.isEmpty()) { taskService.setVariable(taskId, "distribute", false); @@ -296,6 +299,11 @@ public class EsRevisionServiceImpl extends ServiceImpl actVariables = this.setVariables(revisionData); + processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables)); break; case OTHER_DRAFT_USER_UPLOAD: data = revisionData.getData(); @@ -328,6 +336,8 @@ public class EsRevisionServiceImpl extends ServiceImpl flowUser = revisionData.getFlowUser(); + flowUser = revisionData.getFlowUser(); String adviceUsers = (String) flowUser.get("adviceUserList"); List adviceUserList = Arrays.asList(adviceUsers.split(",")); taskService.setVariable(taskId, "adviceUserList", adviceUserList); @@ -370,6 +382,9 @@ public class EsRevisionServiceImpl extends ServiceImpl relatedLeaderList = Arrays.asList(data.getRelatedLeader().split(",")); String chiefEngineer = data.getChiefEngineer(); - userMap.put("proofreaderList", proofreaderList); - userMap.put("approvalUserList", approvalUserList); - userMap.put("approvalUserStandard", approvalUserStandard); - userMap.put("relatedLeaderList", relatedLeaderList); + userMap.put("otherDraftUserList", proofreaderList); + userMap.put("mainDraftUserLeaderList", approvalUserList); + userMap.put("standardizationUser", approvalUserStandard); + userMap.put("relatedDeptLeaderList", relatedLeaderList); userMap.put("chiefEngineer", chiefEngineer); taskService.setVariables(taskId, userMap); saveOrUpdate(data); + processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); break; case MAIN_DRAFT_USER_RELEASE: // do nothing now TODO 在线编辑 插入签章