diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 67369a77..523fbd74 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConsta import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType; import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO; @@ -189,7 +190,18 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl variables = setVariables(initChangeDataVO); actFlowCommonService.setProcessVariables(processInstanceId, variables); - processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, getUserMap(variables)); + Map userMap = getUserMap(variables); + processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); + // 如果是责任部门变更分支,后几个流程需要将部分选人信息保存到业务表中 + String newMainDraftUserLeaderLeader = (String) userMap.get("newMainDraftUserLeaderLeader"); + String newMainDraftUserLeader = (String) userMap.get("newMainDraftUserLeader"); + String relatedUserList = (String) userMap.get("relatedUserList"); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); + updateWrapper.set(StrUtil.isNotBlank(newMainDraftUserLeaderLeader), ProcessEsInitChange::getNewMainDraftUserLeaderLeader, newMainDraftUserLeaderLeader); + updateWrapper.set(StrUtil.isNotBlank(newMainDraftUserLeader), ProcessEsInitChange::getNewMainDraftUserLeader, newMainDraftUserLeader); + updateWrapper.set(StrUtil.isNotBlank(relatedUserList), ProcessEsInitChange::getRelatedUserList, relatedUserList); + update(updateWrapper); } runtimeService.setVariableLocal(processInstanceId, "pass", true); } else { @@ -202,8 +214,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl