From f5ffceceb6e1354dadeefdec66187d4e02d967b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 9 Aug 2024 09:51:37 +0800
Subject: [PATCH] fix:88255

---
 .../activiti/service/ProcessAllService.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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<ProcessAllMapper, ProcessAll>
         }
 
         //查询所有待办任务
-        LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
-        wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
-        List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper);
+        LambdaQueryWrapper<ProcessApprovalRecord> wrapperOld = new LambdaQueryWrapper<>();
+        wrapperOld.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
+        wrapperOld.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
+        List<ProcessApprovalRecord> approvalRecordListOld = approvalRecordService.list(wrapperOld);
 
         //activiti撤销
         runtimeService.deleteProcessInstance(processInstanceId,"强制撤回");
@@ -275,6 +275,11 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         processApprovalRecord.setCreateTime(null);
         approvalRecordService.save(processApprovalRecord);
 
+        //查询所有待办任务
+        LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
+        wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
+        List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper);
         //同步删除操作到统一待办
         List<UnifiedTodoVO> todoAddList = new ArrayList<>();
         String processDefinitionId = processAll.getProcessDefinitionId();
@@ -288,7 +293,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         pushWorkflowIntegrationAPI.sendTodoTask(todoAddList);
 
         // 撤回后修改状态为未处理
-        for (ProcessApprovalRecord approvalRecord : approvalRecordList) {
+        for (ProcessApprovalRecord approvalRecord : approvalRecordListOld) {
             LambdaUpdateWrapper<ProcessApprovalRecord> updateProcessApprovalRecord = new LambdaUpdateWrapper<>();
             updateProcessApprovalRecord.eq(ProcessApprovalRecord::getId,approvalRecord.getId());
             updateProcessApprovalRecord.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.SUSPEND.getValue());