From b012ac96a5ee316452ddbd69a746257133da68c6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 08 12월 2021 16:26:45 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/resources/mybatis/query-template/issue-template.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 980a1ed..55d1396 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -192,6 +192,7 @@
             </when>
         </choose>
         AND issue.parent_issue_id IS NULL
+        AND issue_status.issue_status_type != 'CLOSE'
         AND issue.reverse_index <![CDATA[ < ]]> 0
         AND workspace.id = #{workspaceId}
         GROUP BY issue.id
@@ -383,6 +384,7 @@
             </when>
         </choose>
         AND issue.parent_issue_id IS NULL
+        AND issue_status.issue_status_type != 'CLOSE'
         AND issue.reverse_index <![CDATA[ < ]]> 0
         AND workspace.id = #{workspaceId}
         GROUP BY issue.id
@@ -530,8 +532,10 @@
         COUNT(DISTINCT issue.id)
         FROM issue issue
         LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
+        LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
         WHERE 1=1
         AND issue.parent_issue_id IS NULL
+        AND iss.issue_status_type != 'CLOSE'
         <if test="title != null and !title.equals('') ">
             AND issue.title like CONCAT('%',#{title},'%')
         </if>
@@ -654,8 +658,10 @@
         COUNT(DISTINCT issue.id)
         FROM issue issue
         LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
+        LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
         WHERE 1=1
         AND issue.parent_issue_id IS NULL
+        AND iss.issue_status_type != 'CLOSE'
         <if test="title != null and !title.equals('') ">
             AND issue.title like CONCAT('%',#{title},'%')
         </if>

--
Gitblit v1.8.0