diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 40887737..b0af7b97 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -254,10 +254,10 @@ public class ProcessAllService extends ServiceImpl } //查询所有待办任务 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); - wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue()); - List approvalRecordList = approvalRecordService.list(wrapper); + LambdaQueryWrapper wrapperOld = new LambdaQueryWrapper<>(); + wrapperOld.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); + wrapperOld.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue()); + List approvalRecordListOld = approvalRecordService.list(wrapperOld); //activiti撤销 runtimeService.deleteProcessInstance(processInstanceId,"强制撤回"); @@ -275,6 +275,11 @@ public class ProcessAllService extends ServiceImpl processApprovalRecord.setCreateTime(null); approvalRecordService.save(processApprovalRecord); + //查询所有待办任务 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); + wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue()); + List approvalRecordList = approvalRecordService.list(wrapper); //同步删除操作到统一待办 List todoAddList = new ArrayList<>(); String processDefinitionId = processAll.getProcessDefinitionId(); @@ -288,7 +293,7 @@ public class ProcessAllService extends ServiceImpl pushWorkflowIntegrationAPI.sendTodoTask(todoAddList); // 撤回后修改状态为未处理 - for (ProcessApprovalRecord approvalRecord : approvalRecordList) { + for (ProcessApprovalRecord approvalRecord : approvalRecordListOld) { LambdaUpdateWrapper updateProcessApprovalRecord = new LambdaUpdateWrapper<>(); updateProcessApprovalRecord.eq(ProcessApprovalRecord::getId,approvalRecord.getId()); updateProcessApprovalRecord.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.SUSPEND.getValue());