From e039818a42388e6a5242310bd43f20a97c762c5a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Sep 2021 14:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=8D=97=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/GuideListFormDTO.java   |  2 +-
 .../src/main/resources/mapper/GuideDao.xml     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
index 2e36d7c517..d8edcf1308 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideListFormDTO.java
@@ -24,7 +24,7 @@ public class GuideListFormDTO extends PageFormDTO implements Serializable {
     /**
      * 分类
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 标题
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
index 037eabb07f..f86c8e0882 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml
@@ -38,20 +38,20 @@
         <if test='null != guideTitle and "" != guideTitle'>
             AND g.TITLE LIKE CONCAT( '%', #{guideTitle}, '%' )
         </if>
-        <if test='null != categoryId and "" != categoryId'>
-            AND g.CATEGORY_ID = #{categoryId}
+        <if test='null != categoryCode and "" != categoryCode'>
+            AND g.CATEGORY_CODE = #{categoryCode}
         </if>
         ORDER BY g.CREATED_TIME DESC
     </select>
     <select id="getGuideDetail" resultType="com.epmet.dto.result.GuideDetailResultDTO">
         SELECT
             g.ID AS "guideId",
-            ORG_TYPE,
-            ORG_ID,
-            ORG_NAME,
-            TITLE,
-            CATEGORY_CODE,
-            CATEGORY_NAME
+            g.ORG_TYPE,
+            g.ORG_ID,
+            g.ORG_NAME,
+            g.TITLE,
+            g.CATEGORY_CODE,
+            gc.CATEGORY_NAME
         FROM
             guide g
         INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE
@@ -67,7 +67,7 @@
             g.UPDATED_TIME AS updatedTime,
         FROM
             guide g
-        INNER JOIN guide_category gc ON g.CATEGORY_ID = gc.ID AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
+        INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}
         INNER JOIN guide_collection gco ON g.ID = gco.GUIDE_ID AND gco.USER_ID = #{userId} AND gco.APP = #{app} AND gco.DEL_FLAG = 0
         WHERE g.DEL_FLAG = 0
         AND g.CUSTOMER_ID = #{customerId}