From cef6d1aaf4964d55e8e4593cc7c5570caa4f8c58 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 30 May 2024 16:10:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/service/ProcessApprovalRecordService.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
index 5c0924b0..1ec989c6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
@@ -54,6 +54,7 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){
             wrapper.in("finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(",")));
         }
+        wrapper.eq(processApprovalRecord.getFinishFlag() != null, "finish_flag", processApprovalRecord.getFinishFlag());
         wrapper.eq("over_due", YesOrNoEnum.NO.getValue());
         wrapper.eq("process_instance_id", processApprovalRecord.getProcessInstanceId());
         wrapper.last("ORDER BY IF(ISNULL(create_time), 1, 0) DESC ,create_time DESC, end_time DESC");