diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 5a2b58c338..9cc3425437 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -229,11 +229,17 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		GovArticleDetailResultDTO articleDetail = baseDao.queryGovArticleDetail(articleId);
 		if (null != articleDetail) {
 			List<GovArticleContentDTO> articleContentList = baseDao.queryGovArticleContent(articleId);
-			articleDetail.setArticleContentList(articleContentList);
+			if(null!=articleContentList&&articleContentList.size()>0){
+				articleDetail.setArticleContentList(articleContentList);
+			}else{
+				articleDetail.setArticleContentList(new ArrayList<>());
+			}
             if (StringUtils.isNoneBlank(articleDetail.getTags())) {
                 String[] tagNames = articleDetail.getTags().split("\\|");
                 articleDetail.setTagNameList(tagNames);
-            }
+            }else{
+				articleDetail.setTagNameList(new String[0]);
+			}
 		}
 		return articleDetail;
 	}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
index 1cd8271353..4b3bd768d3 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
@@ -44,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -161,10 +162,16 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
         DraftDetailResultDTO draftDetailResultDTO=baseDao.selectDraftDetail(formDTO.getDraftId());
         if(null!=draftDetailResultDTO){
             List<GovDraftContentDTO> articleContentList=baseDao.selectDraftContentList(formDTO.getDraftId());
-            draftDetailResultDTO.setArticleContentList(articleContentList);
+            if (null != articleContentList && articleContentList.size() > 0) {
+                draftDetailResultDTO.setArticleContentList(articleContentList);
+            } else {
+                draftDetailResultDTO.setArticleContentList(new ArrayList<>());
+            }
             if (StringUtils.isNoneBlank(draftDetailResultDTO.getTags())) {
                 String[] tagNames = draftDetailResultDTO.getTags().split("\\|");
                 draftDetailResultDTO.setTagNameList(tagNames);
+            }else{
+                draftDetailResultDTO.setTagNameList(new String[0]);
             }
         }
         return draftDetailResultDTO;