--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/form/fg/articlelibrary/FgQueryArticleLibraryForm.java

@@ -18,4 +18,6 @@ public class FgQueryArticleLibraryForm {
 	private List<String> labelContentDiyTypeCode;
 	@ApiModelProperty("资源类型 0全部  1图书、2文章、3图片、4视频、5音频、6附件、7医家资源 ")
 	private Integer resourceType;
+	@ApiModelProperty("文章名称")
+	private String name;
 }

app/resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrClient;
@@ -116,6 +117,17 @@ public class FgArticleLibraryController {
 	}
 	
 	@ApiOperation(value = "查询", notes = "根据ID查询")
+	@GetMapping(value = "/get/all/name")
+	public CallBack<List<String>> getAllName(FgQueryArticleLibraryForm from) {
+		Example example = service.createExample();
+		example.createCriteria().andLike("name", "%"+from.getName()+"%");
+		List<ArticleLibrary> list = service.selectByExample(example);
+		List <String> aa = list.stream().map(ArticleLibrary::getName).collect(Collectors.toList());
+		return CallBack.success(aa);
+		
+	}
+	
+	@ApiOperation(value = "查询", notes = "根据ID查询")
 	@GetMapping(value = "/get/{oid}")
 	public CallBack<FgArticleLibraryOneVO> getById(@PathVariable String oid) {
 		FgArticleLibraryOneVO vo = service.articleOneInfoById(oid,true);

app/resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -462,11 +462,6 @@ public class FgEbookController {
 //			PageHelper.orderBy(" orderNum asc, pdfNum asc");
 //			List<ChapterLibrary> list = clservice.selectByExample(example);
 			List<ChapterLibrary> list =clmapper.selectchapterList(bookId, orderNum);
-			for (ChapterLibrary listchapt : list) {
-				Document doc = Jsoup.parse(listchapt.getText());
-				System.out.println(doc.getElementsByClass("content").text());
-				listchapt.setText(doc.getElementsByClass("content").text());
-			}
 			List<ChapterLibrary> voList = Copy.copyList(list , ChapterLibrary.class, obj -> obj.getLevel().intValue() == 0);
 			tree(list,voList);
 			return voList;

app/resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -1018,7 +1018,6 @@ public class FgResourceLibraryController {
 					fqSq.append(" && resourceType : "+form.getResourceType());
 				}
 			}
-			
 			//act  其它资源和文章分开  1：除文章的所有资源 2:只有文章
 			if(form.getAct() !=null ){
 				//判断搜索过滤