Merge remote-tracking branch 'origin/dev_third_data' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -235,12 +235,13 @@
         <foreach collection="list" item="l" separator=" UNION ALL ">
             SELECT
             #{l.projectId} AS projectId,
-            CATEGORY_NAME
-            FROM issue_project_category_dict
-            WHERE DEL_FLAG = '0'
-            AND IS_DISABLE = 'enable'
-            AND CUSTOMER_ID = #{customerId}
-            AND CATEGORY_CODE = #{l.categoryCode}
+            CONCAT(if(cd2.CATEGORY_CODE = '0','',CONCAT(cd2.CATEGORY_NAME,'-')),cd.CATEGORY_NAME) AS categoryName
+            FROM issue_project_category_dict cd
+            LEFT JOIN issue_project_category_dict cd2 ON cd2.CATEGORY_CODE = cd.PARENT_CATEGORY_CODE AND cd2.DEL_FLAG = '0'
+            WHERE cd.DEL_FLAG = '0'
+            AND cd.IS_DISABLE = 'enable'
+            AND cd.CUSTOMER_ID = #{customerId}
+            AND cd.CATEGORY_CODE = #{l.categoryCode}
         </foreach>
     </select>