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-12-26 16:25:06 +08:00
parent f62cb2015f
commit 737282a71e
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/esRevision/service/impl/EsRevisionServiceImpl.java
+7 -1
View File
@@ -268,8 +268,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
LambdaQueryWrapper<ProcessEsRevision> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessEsRevision> wrapper = new LambdaQueryWrapper<>();
LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>();
LambdaUpdateWrapper<EsRevisionAdvice> adviceWrapper = new LambdaUpdateWrapper<>();
wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
wrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue()); wrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
adviceWrapper.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId);
ProcessEsRevision dataDb = getOne(wrapper); ProcessEsRevision dataDb = getOne(wrapper);
updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId); updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
updateWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue()); updateWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
@@ -395,10 +397,14 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
data = revisionData.getData(); data = revisionData.getData();
// 先删后增
runtimeService.setVariable(executionId, "contactUserLeader", data.getContactUserLeader()); runtimeService.setVariable(executionId, "contactUserLeader", data.getContactUserLeader());
userMap.put("contactUserLeader", data.getContactUserLeader()); userMap.put("contactUserLeader", data.getContactUserLeader());
advices = data.getAdvices(); advices = data.getAdvices();
adviceService.saveOrUpdateBatch(advices); //
adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
adviceService.remove(adviceWrapper);
adviceService.saveBatch(advices);
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
case CONTACT_USER_LEADER_APPROVAL: case CONTACT_USER_LEADER_APPROVAL:
// 保存流程数据 // 保存流程数据