From 2eab88381e5439032f04c21b45b070396b86d7c6 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 9 Jun 2020 17:37:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ArticleServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 565e6bfda3..4c5df161a4 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -82,7 +83,7 @@ public class ArticleServiceImpl implements ArticleService {
 
         }
 
-        throw new RenException(articles.getInternalMsg());
+        return new ArrayList<>();
     }
 
 }

From 699e02a534d01a3eadc863d6f182d3b000a4ed56 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 9 Jun 2020 17:45:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=88=97=E8=A1=A8=E6=A0=B9=E6=8D=AEtagId=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ArticleServiceImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 4c5df161a4..55ad32285d 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -68,7 +68,10 @@ public class ArticleServiceImpl implements ArticleService {
     @Override
     public List<ArticleWithTagsResultDTO> articleList(ArticlePageFormDTO articlePageFormDTO) {
         Result<List<ArticleListResultDTO>> articles = govVoiceOpenFeignClient.resiArticleList(articlePageFormDTO);
-        if(articles.success() && null != articles.getData() && articles.getData().size() > NumConstant.ZERO){
+        if(articles.success()){
+            if(null == articles.getData() || articles.getData().size() <= NumConstant.ZERO){
+                return new ArrayList<>();
+            }
             return articles.getData().stream().map(article -> {
                 ArticleWithTagsResultDTO artObj = ConvertUtils.sourceToTarget(article,ArticleWithTagsResultDTO.class);
                 artObj.setTagName(new HashSet<>());
@@ -83,7 +86,7 @@ public class ArticleServiceImpl implements ArticleService {
 
         }
 
-        return new ArrayList<>();
+        throw new RenException(articles.getInternalMsg());
     }
 
 }

From 2d00a5bdf7e74cbe446742ab3098feae161146ef Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 9 Jun 2020 17:48:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/ArticleServiceImpl.java  |  6 +++---
 .../scan/common/exception/AuthException.java    | 17 -----------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/AuthException.java

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 f3f7ed18a3..953624ed68 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
@@ -945,8 +945,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod),textScanParamDTO);
 		} catch (Exception e) {
 			log.error("scanContent exception",e);
-			this.sendMsg(draftEntity.getTitle(),String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle());
-			this.updateDraftPublishStatus(draftId,DraftConstant.AUDITFAIL)
+			this.sendMsg(draftEntity.getTitle(),String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			this.updateDraftPublishStatus(draftId,DraftConstant.AUDITFAIL);
 		}
 		SyncScanResult result = new SyncScanResult();
 		if (imgSyncScanResult.isAllPass()){
@@ -987,7 +987,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
 			this.sendMsg(draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
-			this.updateDraftPublishStatus(draftId,DraftConstant.AUDITFAIL)
+			this.updateDraftPublishStatus(draftId,DraftConstant.AUDITFAIL);
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
 
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/AuthException.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/AuthException.java
deleted file mode 100644
index 7d0b652025..0000000000
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/AuthException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.epmet.openapi.scan.common.exception;
-
-import com.epmet.openapi.scan.common.enu.SysResponseEnum;
-
-/**
- * @author jianjun liu
- * @date 2020-06-05 10:31
- **/
-public class AuthException extends RuntimeException {
-	private int code;
-	private String msg;
-
-	public AuthException() {
-		this.code = SysResponseEnum.AUTH_FAIL.getCode();
-		this.msg = SysResponseEnum.AUTH_FAIL.getMsg();
-	}
-}