From 39f154dea4be394be4b2b72239d14d54551ac9f3 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 14:54:17 +0900
Subject: [PATCH] - prod 설정 파일 수정 - api 이슈 수정시 사용자 정의 필드 항목 개수가 맞아도 입력한 사용자 정의 필드 값만 검색하여 수정하도록 변경

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

diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 32d6e66..6dc1b5a 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -32,6 +32,9 @@
         severity.id as severityId,
         severity.name as severityName,
         severity.color as severityColor,
+        ic.name AS companyName,
+        ii.name AS ispName,
+        ih.name AS hostingName,
         GROUP_CONCAT(issue_custom.use_value) AS useValue,
         IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
         IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
@@ -1096,14 +1099,22 @@
             issue.id as id,
             issue.title as title,
             customFieldValue.customFieldType AS customFieldType,
-            GROUP_CONCAT(customFieldValue.useValue) AS concatUseValue
+            GROUP_CONCAT(customFieldValue.useValue ORDER BY customFieldValue.customFieldId ASC) AS concatUseValue
         FROM issue issue FORCE INDEX(reverseIndex)
         INNER JOIN issue_status as issStatus ON issue.issue_status_id = issStatus.id
             LEFT OUTER JOIN (
             SELECT cf.id AS customFieldId, cf.custom_field_type AS customFieldType, issue_custom.use_value AS useValue, issue_custom.issue_id AS issueId
             FROM issue_custom_field_value issue_custom
             INNER JOIN custom_field cf ON cf.id = issue_custom.custom_field_id
-            ORDER BY issue_custom.id ASC) customFieldValue ON customFieldValue.issueId = issue.id
+            <choose>
+                <when test="useValues.size != 0">
+                    WHERE issue_custom.use_value IN
+                    <foreach collection="useValues" item="item" index="index" separator="," open="(" close=")">
+                        #{item}
+                    </foreach>
+                </when>
+            </choose>
+            ) customFieldValue ON customFieldValue.issueId = issue.id
         WHERE issStatus.issue_status_type != 'CLOSE'
           AND issue.issue_type_id = #{issueTypeId}
         GROUP BY issue.id

--
Gitblit v1.8.0