--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java

@@ -145,7 +145,7 @@ public class ArticleLibraryController {
 				ArticleLibraryDiyType type = new ArticleLibraryDiyType();
 				type.setCode(dtiyType.getCode());
 				type.setDtId(dtiyType.getDtId());
-				type.setAlId(dtiyType.getAlId());
+				type.setAlId(alId);
 				list.add(type);
 			}
 		});

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/pc/index/FgIndexController.java

@@ -46,6 +46,7 @@ public class FgIndexController {
 	@GetMapping("ebook_"+ResourceRequestPath.PAGE)
 	public CallBack<List<FgIndexEbookListVO>> getBookList() {
 		List<FgIndexEbookListVO> list = ebookservice.list();
+		this.regEx1(list);
 		return CallBack.success(list);
 	}
 	@ApiOperation("首页下载")
@@ -58,6 +59,7 @@ public class FgIndexController {
 	@GetMapping("article_"+ResourceRequestPath.PAGE)
 	public CallBack<List<FgIndexArticleListVO>> getArticleList() {
 		List<FgIndexArticleListVO> list = fgArticleLibraryService.list();
+		this.regEx2(list);
 		return CallBack.success(list);
 	}
 	@ApiOperation("头部检索")
@@ -94,6 +96,24 @@ public class FgIndexController {
 			});
 		}
 	}
+	private void regEx1(List<FgIndexEbookListVO> list){
+		if(ArrayUtils.isNotEmpty(list)){
+			list.forEach(li -> {
+				if(StringUtils.isNotBlank(li.getIntro())){
+					li.setIntro(removeLabel(li.getIntro()));
+				}
+			});
+		}
+	}
+	private void regEx2(List<FgIndexArticleListVO> list){
+		if(ArrayUtils.isNotEmpty(list)){
+			list.forEach(li -> {
+				if(StringUtils.isNotBlank(li.getSynopsis())){
+					li.setSynopsis(removeLabel(li.getSynopsis()));
+				}
+			});
+		}
+	}
 	/**
 	 * 去标签
 	 * @param list