Merge remote-tracking branch 'remotes/origin/dev_new_article'

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

@@ -25,8 +25,8 @@
     <select id="queryGovArticleContent" parameterType="java.lang.String" resultType="com.epmet.dto.result.GovArticleContentDTO">
         SELECT
             ac.CONTENT_TYPE,
-            ac.CONTENT,
-            ac.FILE_NAME
+            IFNULL(ac.CONTENT,'') CONTENT,
+            IFNULL(ac.FILE_NAME,'') FILE_NAME
         FROM
             article_content ac
         WHERE
@@ -298,9 +298,9 @@
         art.PUBLISHER_NAME AS publishUnitDesc,
         art.PUBLISH_DATE AS publishDate,
         IFNULL(art.TAGS,'') AS tags,
-        content2.CONTENT,
+        IFNULL(content2.CONTENT,'') CONTENT,
         content2.CONTENT_TYPE,
-        content2.FILE_NAME,
+        IFNULL(content2.FILE_NAME,'') FILE_NAME,
         (SELECT COUNT(1) FROM ARTICLE_VISIT_RECORD WHERE DEL_FLAG = '0' AND ARTICLE_ID = #{articleId} AND GRID_ID = #{gridId}) AS visitRecordCount,
         art.CUSTOMER_ID
         FROM
@@ -308,9 +308,9 @@
         LEFT JOIN (
         SELECT
         content.ARTICLE_ID,
-        content.CONTENT,
+        IFNULL(content.CONTENT,'') CONTENT,
         content.CONTENT_TYPE,
-        content.FILE_NAME,
+        IFNULL(content.FILE_NAME,'') FILE_NAME,
         content.ORDER_NUM
         FROM
         ARTICLE_CONTENT content

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

@@ -26,9 +26,9 @@
     <select id="selectDraftContentDetail" parameterType="java.lang.String" resultType="com.epmet.dto.result.DraftContentDetailDTO">
         SELECT
         dc.ID,
-        dc.CONTENT,
+        IFNULL(dc.CONTENT,'') CONTENT,
         dc.CONTENT_TYPE,
-        dc.FILE_NAME,
+        IFNULL(dc.FILE_NAME,'') FILE_NAME,
         dc.ORDER_NUM,
         (case
         when dc.AUDIT_STATUS is null then ""