From 2c273d1072424a9363314fb258265cbf487f0297 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 17:48:46 +0900
Subject: [PATCH] - Excel Import 기능 담당부서도 들어가게 하기(기간 미지정 시에도 가능하도록 수정) - 이슈 통합검색 키워드에 업체,ISP,호스팅 정보도 포함 - 프로젝트에서 설정한 이슈유형만 보여주기

---
 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