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

fix: 立项变更驳回后再次提交报错BUG

Browse Source
This commit is contained in:
mzaxd
2023-10-30 17:08:54 +08:00
parent ae48c88406
commit e3414dc946
1 changed files with 5 additions and 5 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
+5 -5
View File
@@ -191,6 +191,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) { public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
String userId = UserUtils.getUserId(); String userId = UserUtils.getUserId();
CommonVO commonVO = initChangeDataVO.getCommonVO(); CommonVO commonVO = initChangeDataVO.getCommonVO();
List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
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为空或任务不存在");
@@ -198,11 +199,10 @@ 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) {
InitChangeFlowUserVO flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO(); if (initChangeList != null) {
if (flowUserInfoVO != null) { saveOrUpdateBatch(initChangeList);
Map<String, Object> userMap = new HashMap<>(this.setUserVariables(flowUserInfoVO)); Map<String, Object> variables = this.setVariables(initChangeDataVO);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
Map<String, Object> variables = setUserVariables(flowUserInfoVO);
actFlowCommonService.setProcessVariables(processInstanceId, variables); actFlowCommonService.setProcessVariables(processInstanceId, variables);
} }
runtimeService.setVariable(processInstanceId, "pass", true); runtimeService.setVariable(processInstanceId, "pass", true);