From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정

---
 src/main/resources/mybatis/query-template/issueType-template.xml |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index 598fed2..bacd724 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -10,7 +10,8 @@
         it.description as description,
         it.color as color,
         it.project_id as projectId,
-        it.complete_issue_status_id as completeIssueStatusId
+        it.use_partner AS usePartners,
+        it.inherit_partners as inheritPartners
         FROM
         issue_type it
         INNER JOIN workspace ws on it.workspace_id = ws.id
@@ -18,14 +19,30 @@
         <if test="name != '' and name != null">
             AND it.name like CONCAT('%',#{name},'%')
         </if>
+        <choose>
+            <when test="allProjectIds != null and allProjectIds.size != 0">
+                AND it.project_id IN
+                <foreach collection="allProjectIds" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </when>
+        </choose>
         <if test="projectId != '' and projectId != null">
             AND it.project_id like CONCAT('%',#{projectId},'%')
         </if>
+        <choose>
+            <when test="downProjectIds != null and downProjectIds.size != 0">
+                OR it.project_id IN
+                <foreach collection="downProjectIds" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </when>
+        </choose>
         <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
+        ORDER BY it.register_date DESC
         <if test="page != null and !page.equals('')">
             limit #{pageSize} offset #{page};
         </if>

--
Gitblit v1.8.0