ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 企标变更流程责任部门变更报错

Browse Source
This commit is contained in:
mzaxd
2023-10-31 18:20:30 +08:00
parent cc116eb4f1
commit b026e643f1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+7 -1
View File
@@ -194,6 +194,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
String userId = UserUtils.getUserId(); String userId = UserUtils.getUserId();
CommonVO commonVO = initChangeDataVO.getCommonVO(); CommonVO commonVO = initChangeDataVO.getCommonVO();
List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList(); List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
InitChangeFlowUserVO flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
String taskId = commonVO.getTaskId(); String taskId = commonVO.getTaskId();
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在"); throw new JeroBootException("taskId为空或任务不存在");
@@ -201,12 +202,17 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId); String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
if (pass) { if (pass) {
if (initChangeList != null) { if (initChangeList != null && flowUserInfoVO != null) {
saveOrUpdateBatch(initChangeList); saveOrUpdateBatch(initChangeList);
Map<String, Object> variables = this.setVariables(initChangeDataVO); Map<String, Object> variables = this.setVariables(initChangeDataVO);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables)); processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
actFlowCommonService.setProcessVariables(processInstanceId, variables); actFlowCommonService.setProcessVariables(processInstanceId, variables);
} }
if (flowUserInfoVO != null) {
Map<String, Object> variables = this.setVariables(initChangeDataVO);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
actFlowCommonService.setProcessVariables(processInstanceId, variables);
}
runtimeService.setVariable(processInstanceId, "pass", true); runtimeService.setVariable(processInstanceId, "pass", true);
} else { } else {
// 设置流程变量 // 设置流程变量