From a7b4a5ca8f6f845b40f16da387ec96cf3be9d553 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Wed, 10 Jun 2020 17:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 4e754488d7..3435a1581d 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
@@ -987,7 +987,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			result = new SyncScanResult();
 			if (imgSyncScanResult != null){
 				SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
-				if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
+				if (imgSyncScanResult.success()) {
 					result.setAllPass(imgSyncScanResultData.isAllPass());
 					result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
 					result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
@@ -995,7 +995,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 			if (textSyncScanResult != null) {
 				SyncScanResult textSyncScanResultData = textSyncScanResult.getData();
-				if (textSyncScanResult.success() && textSyncScanResultData.isAllPass()) {
+				if (textSyncScanResult.success()) {
 					result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false);
 					result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds());
 					result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds());
@@ -1053,6 +1053,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			log.error("updateAuditStatusFailById draftId:{} is not exist in db", draftId);
 			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
 		}
+		this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 		boolean coverFail = false,contentFail = false;
 		try {
 			List<String> failDataIds = syncScanResult.getFailDataIds();
@@ -1082,13 +1083,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				}else if (coverFail){
 					auditMsg = "封面";
 				}
-				this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle(),auditMsg));
-				this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+				this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(),auditMsg));
 			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
 			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
 	}