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

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -334,8 +334,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			throw new RenException(ModuleConstant.DRAFT_IS_TOP_ERROR);
 		}
 
-		if ( !DraftConstant.AGENCY.equals(fromDTO.getPublisherType()) || !DraftConstant.DEPARTMENT.equals(fromDTO.getPublisherType())
+		if (!DraftConstant.AGENCY.equals(fromDTO.getPublisherType()) || !DraftConstant.DEPARTMENT.equals(fromDTO.getPublisherType())
-				!DraftConstant.GRID.equals(fromDTO.getPublisherType())) {
+				|| !DraftConstant.GRID.equals(fromDTO.getPublisherType())) {
 			throw new RenException(ModuleConstant.DRAFT_PUBLISHER_TYPE_ERROR);
 		}
 		return saveDraftAttr(tokenDto, fromDTO);