From 3da71368d451c455872a6ca114c0540e65308aef Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 15:32:43 +0900
Subject: [PATCH] 공지사항,Faq,가이드,Qna 통합 수정 - 일반회원은 faq,가이드 활성화 된 게시글만 보이기 - 엑셀다운,삭제 기능 추가(기존에 없었음) - 삭제,수정 시 권한 체크

---
 src/main/resources/mybatis/query-template/issue-template.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 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..11819d2 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,13 @@
             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
+            INNER JOIN custom_field cf ON cf.id = issue_custom.custom_field_id) 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