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,18 +964,22 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 
 			result = new SyncScanResult();
+			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());
 				}
+			}
+			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);
 			this.sendMsg(draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));