From f4c81b55e61a7ad8f73f5089c78aa91974ea327e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 6 Jul 2022 15:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=86=85=E5=AE=B9null?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ArticleDao.xml         | 12 ++++++------
 .../src/main/resources/mapper/DraftDao.xml           |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
index 875773b8c9..94f7798cf8 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
+++ b/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,''),
+            IFNULL(ac.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,''),
         content2.CONTENT_TYPE,
-        content2.FILE_NAME,
+        IFNULL(content2.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_TYPE,
-        content.FILE_NAME,
+        IFNULL(content.FILE_NAME,''),
         content.ORDER_NUM
         FROM
         ARTICLE_CONTENT content
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
index cfe5e6c14b..bad753cd78 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
+++ b/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,''),
         dc.CONTENT_TYPE,
-        dc.FILE_NAME,
+        IFNULL(dc.FILE_NAME,''),
         dc.ORDER_NUM,
         (case
         when dc.AUDIT_STATUS is null then ""