--no commit message

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

 package com.zrqx.resource.fg.controller.ebook;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -152,6 +153,24 @@ public class FgEbookController {
 		return CallBack.success(vo);
 	}
 	
+	
+	@ApiOperation("查找所有电子书目录,适用于解放军出版社")
+	@GetMapping("/get/all")
+	public CallBack<List<FgEbookChapterVO>> allecho() {
+		
+		List<FgEbookChapterVO> volist = new ArrayList<FgEbookChapterVO>();
+		PageHelper.orderBy(" updatetime asc");
+		List<Ebook> list = ebookservice.selectAll();
+		for (Ebook ebook : list) {
+			FgEbookChapterVO vo= clmapper.selectchapter(ebook.getId(),1);
+			// 目录
+			List<ChapterLibrary> chapterList = this.getDirectory(null,ebook.getId(),1);
+			vo.setChapterList(chapterList);
+			volist.add(vo);
+		}
+		return CallBack.success(volist);
+	}
+	
 	/**
 	 * 根据图书id查询目录
 	 * @param form
@@ -388,10 +407,10 @@ public class FgEbookController {
 			List<ChapterLibrary> list = clservice.selectByExample(example);
 			return list;
 		} else {
-			example.createCriteria().andEqualTo("bookId", bookId).andNotEqualTo("orderNum", orderNum);
-			PageHelper.orderBy(" orderNum asc, pdfNum asc");
-			List<ChapterLibrary> list = clservice.selectByExample(example);
-			clmapper.selectchapterList(bookId, orderNum);
+//			example.createCriteria().andEqualTo("bookId", bookId).andNotEqualTo("orderNum", orderNum);
+//			PageHelper.orderBy(" orderNum asc, pdfNum asc");
+//			List<ChapterLibrary> list = clservice.selectByExample(example);
+			List<ChapterLibrary> list =clmapper.selectchapterList(bookId, orderNum);
 			
 			List<ChapterLibrary> voList = Copy.copyList(list , ChapterLibrary.class, obj -> obj.getLevel().intValue() == 0);
 			tree(list,voList);