From 106573502a7b2f016219b337b633bb55a2f0b114 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 10:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ArticleServiceImpl.java      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 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 9c6d312000..1ac37bac89 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
@@ -964,17 +964,21 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 
 			result = new SyncScanResult();
-			SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
-			if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
-				result.setAllPass(imgSyncScanResultData.isAllPass());
-				result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
-				result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
+			if (imgSyncScanResult != null){
+				SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
+				if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
+					result.setAllPass(imgSyncScanResultData.isAllPass());
+					result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
+					result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
+				}
 			}
-			SyncScanResult textSyncScanResultData = textSyncScanResult.getData();
-			if (textSyncScanResult.success()&&textSyncScanResultData.isAllPass()) {
-				result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false);
-				result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds());
-				result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds());
+			if (textSyncScanResult != null) {
+				SyncScanResult textSyncScanResultData = textSyncScanResult.getData();
+				if (textSyncScanResult.success() && textSyncScanResultData.isAllPass()) {
+					result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false);
+					result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds());
+					result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds());
+				}
 			}
 		} catch (Exception e) {
 			log.error("scanContent exception", e);