From a73c65eae975824bd59de8d6f19d383f5636840a Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 6 Apr 2024 11:14:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/workflow/ActTaskMapper.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml
index 6801a8e39..d1508abca 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml
@@ -56,7 +56,7 @@
               FROM ACT_HI_TASKINST HTI
                        INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_
                        INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_
-              WHERE HTI.PARENT_TASK_ID_ IS NULL
+              WHERE HTI.PARENT_TASK_ID_ IS NULL AND HTI.END_TIME_ IS NOT NULL
               ORDER BY HTI.START_TIME_ DESC) t ${ew.getCustomSqlSegment}
     </select>
 
@@ -71,7 +71,7 @@
               FROM ACT_HI_TASKINST AHT
                        INNER JOIN ACT_HI_PROCINST AHP ON AHT.PROC_INST_ID_ = AHP.PROC_INST_ID_
                        INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = AHT.PROC_DEF_ID_
-              WHERE AHT.PARENT_TASK_ID_ is not null
+              WHERE AHT.PARENT_TASK_ID_ IS NOT NULL
                 and AHT.scope_type_ = 'copy'
               ORDER BY AHT.START_TIME_ DESC) t ${ew.getCustomSqlSegment}
     </select>