Merge branch 'dev_guidance' into develop

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml

@@ -24,12 +24,12 @@
         SELECT
             g.ID AS "guideId",
             g.TITLE AS "title",
-            gc.CATEGORY_NAME AS categoryName,
-            g.CREATED_BY AS createdId,
-            g.UPDATED_TIME AS updatedTime,
+            gc.CATEGORY_NAME AS "categoryName",
+            g.CREATED_BY AS "createdId",
+            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}
         WHERE g.DEL_FLAG = 0
         AND g.CUSTOMER_ID = #{customerId}
         <if test='null != agencyId and "" != agencyId'>
@@ -41,6 +41,7 @@
         <if test='null != categoryId and "" != categoryId'>
             AND g.CATEGORY_ID = #{categoryId}
         </if>
+        ORDER BY g.CREATED_TIME DESC
     </select>
     <select id="getGuideDetail" resultType="com.epmet.dto.result.GuideDetailResultDTO">
         SELECT