From 04a1b1839a2aa0ecb6d9673620a6c84ed7a3bea5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 14:28:20 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/issueType-template.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index cdc7a7e..598fed2 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -8,7 +8,9 @@
DISTINCT it.id as id,
it.name as name,
it.description as description,
- it.color as color
+ it.color as color,
+ it.project_id as projectId,
+ it.complete_issue_status_id as completeIssueStatusId
FROM
issue_type it
INNER JOIN workspace ws on it.workspace_id = ws.id
@@ -19,7 +21,11 @@
<if test="projectId != '' and projectId != null">
AND it.project_id like CONCAT('%',#{projectId},'%')
</if>
+ <if test="useProject != '' and useProject != null and useProject == true">
+ AND it.project_id IS NOT NULL
+ </if>
AND ws.id = #{workspaceId}
+ ORDER BY it.id DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
--
Gitblit v1.8.0