Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

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 != null){
-			if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
+				SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
-				result.setAllPass(imgSyncScanResultData.isAllPass());
+				if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
-				result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
+					result.setAllPass(imgSyncScanResultData.isAllPass());
-				result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
+					result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
+					result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
+				}
 			}
-			SyncScanResult textSyncScanResultData = textSyncScanResult.getData();
+			if (textSyncScanResult != null) {
-			if (textSyncScanResult.success()&&textSyncScanResultData.isAllPass()) {
+				SyncScanResult textSyncScanResultData = textSyncScanResult.getData();
-				result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false);
+				if (textSyncScanResult.success() && textSyncScanResultData.isAllPass()) {
-				result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds());
+					result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false);
-				result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds());
+					result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds());
+					result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds());
+				}
 			}
 		} catch (Exception e) {
 			log.error("scanContent exception", e);