From 47ea0ccf028cb48edccf0370c441444bed3ea5a1 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 26 Jun 2024 09:03:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E5=90=8E=E5=8F=91=E9=80=81=E5=88=A0=E9=99=A4taskOA=E5=8C=85?=
 =?UTF-8?q?=E6=8B=AC=E5=AE=8C=E6=88=90=E6=A0=87=E8=AF=86=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/activiti/service/ProcessAllService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 a5e0767d..ea725521 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
@@ -271,7 +271,8 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         //查询所有待办任务
         LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
-        wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
+        wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue())
+                .or().isNull(ProcessApprovalRecord::getFinishFlag);
         List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper);
 
         List<HiworkTodoAdd> todoAddList = new ArrayList<>();