Merge branch 'dev_third_data' into dev_temp

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

@@ -237,7 +237,7 @@
             #{l.projectId} AS projectId,
             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'
+            LEFT JOIN issue_project_category_dict cd2 ON cd2.CATEGORY_CODE = cd.PARENT_CATEGORY_CODE AND cd2.DEL_FLAG = '0' AND cd2.CUSTOMER_ID = #{customerId}
             WHERE cd.DEL_FLAG = '0'
             AND cd.IS_DISABLE = 'enable'
             AND cd.CUSTOMER_ID = #{customerId}