From fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 10:37:28 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mybatis/query-template/issueType-template.xml | 7 ++++++-
1 files changed, 6 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..b26e4d5 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,6 +21,9 @@
<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}
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
--
Gitblit v1.8.0