From 0aaf4106708f21e7ef4c76c1b41d6cdf0e37af73 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Tue, 9 Jul 2024 10:10:12 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/KnowledgeMapper.xml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
index a19db3c..cebd2ec 100644
--- a/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
+++ b/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
@@ -46,8 +46,8 @@
         where 1 = 1
         <choose>
             <when test="status == null">
-                -- 如果为空,是查全部通过的,不分人(驳回的删除和撤回,其实也属于正常上线的)
-                and ( status = 2 or status = 16 or status = 17 )
+                -- 如果为空,是查全部通过的,不分人(驳回的删除和撤回审核中的,其实也属于正常上线的)
+                and ( status in (2 , 16 , 17 , 11 , 12) )
             </when>
             <when test="status == 1">
                 -- 如果是1,只查自己的草稿
@@ -92,12 +92,12 @@
     </select>
 
     <select id="queryKnowledgeInvalidList" resultType="com.supervision.knowsub.dto.knowledge.CheckInvalidDTO">
-        select t1.id               as knowledgeId,
-               t1.title            as title,
-               t1.status           as status,
-               t2.timeliness       as timeliness,
-               t2.exec_time_begin  as execTimeBegin,
-               t2.exec_time_end    as execTimeEnd
+        select t1.id              as knowledgeId,
+               t1.title           as title,
+               t1.status          as status,
+               t2.timeliness      as timeliness,
+               t2.exec_time_begin as execTimeBegin,
+               t2.exec_time_end   as execTimeEnd
         from ks_knowledge t1
                  left join ks_knowledge_info t2 on t1.info_id = t2.id
         where status = 2