From 2533e106f0152d19849fbbe17d34afecdf05034c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 9 Dec 2020 14:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E6=B5=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IssueCategoryDao.java    |  2 +-
 .../com/epmet/dao/IssueProjectCategoryDictDao.java   |  2 +-
 .../src/main/resources/mapper/IssueCategoryDao.xml   |  4 ++--
 .../resources/mapper/IssueProjectCategoryDictDao.xml | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index b1929c55f7..ad55b96802 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -47,5 +47,5 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Description 查询分类Id对应的分类名称，按分类升序排列
      * @Author sun
      **/
-    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
index 485fef9b4b..c3e44340e4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
@@ -43,5 +43,5 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Description 查询某个分类的下级分类
      * @Author sun
      **/
-    List<CustomerCategoryListResultDTO> subCategoryList(@Param("categoryId") String categoryId);
+    List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId);
 }
\ No newline at end of file
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 833bd4df11..875e1c755b 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
@@ -26,13 +26,13 @@
             issue_project_category_dict
         WHERE
             del_flag = '0'
-        <if test="categoryIdList != null and categoryIdList!= ''">
+        <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
                 id = #{id}
             </foreach>
         </if>
         ORDER BY
-            ip.sort ASC
+            sort ASC
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index 26caac2d50..e638fec0b8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -5,16 +5,16 @@
 
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 start-->
     <resultMap id="categoryTree" type="com.epmet.dto.result.CustomerCategoryListResultDTO">
-        <id column="categoryId" property="id"/>
-        <result column="categoryName" property="name"/>
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
 
-        <collection property="subCategory" column="categoryId" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
+        <collection property="subCategory" column="id" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
         </collection>
     </resultMap>
     <select id="selectCustomerCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_type AS "name"
+            category_name AS "name"
         FROM
             issue_project_category_dict
         WHERE
@@ -26,12 +26,12 @@
     <select id="subCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_type AS "name"
+            category_name AS "name"
         FROM
             issue_project_category_dict
         WHERE
             del_flag = '0'
-        AND pid = #{categoryId}
+        AND pid = #{id}
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->