--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -281,12 +281,12 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			//	vo.setText(null);
 			//}
 			//vo.setPdf(null);
-			if(StringUtils.isNotBlank(vo.getAudio())){
-				vo.setAudio("无权限");
-			}
-			if(StringUtils.isNotBlank(vo.getVideo())){
-				vo.setVideo("无权限");
-			}
+//			if(StringUtils.isNotEmpty(vo.getAudio())){
+//				vo.setAudio("无权限");
+//			}
+//			if(StringUtils.isNotEmpty(vo.getVideo())){
+//				vo.setVideo("无权限");
+//			}
 			// 资源更新中，敬请期待~
 			vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_2.getCode());
 			vo.setMessage(ArticlePromptMessageEnum.STATUS_0.getName());
@@ -365,12 +365,12 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 				//	vo.setText(null);
 				//}
 				//vo.setPdf(null);
-				if(StringUtils.isNotBlank(vo.getAudio())){
-					vo.setAudio("无权限");
-				}
-				if(StringUtils.isNotBlank(vo.getVideo())){
-					vo.setVideo("无权限");
-				}
+//				if(StringUtils.isNotBlank(vo.getAudio())){
+//					vo.setAudio("无权限");
+//				}
+//				if(StringUtils.isNotBlank(vo.getVideo())){
+//					vo.setVideo("无权限");
+//				}
 				// 试读结束，登录后继续阅读全文
 				// 是否免费
 				if(vo.getRealPrice() != null && vo.getRealPrice().doubleValue() != 0){
@@ -420,6 +420,13 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 				return vo;
 			}else{
 				vo.setIsFree(Integer.parseInt(BooleanStatusEnum.YES.getCode()));
+
+				if(StringUtils.isEmpty(vo.getAudio())){
+					vo.setAudio("无权限");
+				}
+				if(StringUtils.isEmpty(vo.getVideo())){
+					vo.setVideo("无权限");
+				}
 				vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_0.getCode());
 				// 获取pdf阅读地址
 				this.getPdfReadUrl(vo);