From 575a9f19221f37b6b9458b02c96bcc954068b7b7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 16 Dec 2020 16:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=B7=B2=E6=9C=89=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0=E6=8B=BC=E6=8E=A5=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/IssueCategoryDao.xml     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 93c51604f7..6d9b7b80da 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -9,32 +9,41 @@
             ip.category_name AS "name"
         FROM
             issue_category ic
-        INNER JOIN issue_project_category_dict ip ON ic.category_id = ip.id
+        INNER JOIN (
+            SELECT
+                a.id AS "idd",
+                a.customer_id AS "customer_id",
+                a.sort AS "sort",
+                CONCAT(b.category_name, '-', a.category_name) AS "category_name"
+            FROM issue_project_category_dict a
+            INNER JOIN issue_project_category_dict b ON a.pid = b.id
+        ) ip ON ic.category_id = ip.idd
         AND ic.customer_id = ip.customer_id
         WHERE
             ic.del_flag = '0'
-        AND ip.del_flag = '0'
         AND ic.issue_id = #{issueId}
         ORDER BY
             ip.sort ASC
     </select>
 
     <select id="selectProjectCategoryList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
-        SELECT
-            id AS "id",
-            category_name AS "name"
+        SELECT DISTINCT
+            ip.id AS "id",
+            CONCAT(cd.category_name,'-',ip.category_name) AS "name"
         FROM
-            issue_project_category_dict
+            issue_project_category_dict ip
+        INNER JOIN issue_project_category_dict cd ON ip.pid = cd.id
         WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
+            ip.del_flag = '0'
+        AND cd.DEL_FLAG = '0'
+        AND ip.customer_id = #{customerId}
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
-                id = #{id}
+                ip.id = #{id}
             </foreach>
         </if>
         ORDER BY
-            sort ASC
+            ip.sort ASC
     </select>
 
     <select id="selectCategoryByIssue" resultType="com.epmet.dto.IssueCategoryDTO">