--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ChapterLibrary.java

@@ -59,4 +59,8 @@ public class ChapterLibrary implements java.io.Serializable {
 	@Transient
 	@ApiModelProperty(value = "绑定资源状态")
 	private String resourceType ;
+	
+	@Transient
+	@ApiModelProperty(value = "简介")
+	private String text ;
 }
\ No newline at end of file

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/ebook/FgEbookChapterVO.java

@@ -3,6 +3,8 @@ package com.zrqx.resource.commons.vo.fg.ebook;
 import java.math.BigDecimal;
 import java.util.List;
 
+import javax.persistence.Transient;
+
 import com.zrqx.resource.commons.model.articlelibrary.ChapterLibrary;
 import com.zrqx.resource.commons.model.diytype.DiyType;
 import com.zrqx.resource.commons.model.resourcerelation.RelationAuthor;

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

@@ -166,6 +166,7 @@ public class FgEbookController {
 			FgEbookChapterVO vo= clmapper.selectchapter(ebook.getId(),1);
 			// 目录
 			List<ChapterLibrary> chapterList = this.getDirectory(null,ebook.getId(),1);
+			
 			vo.setChapterList(chapterList);
 			volist.add(vo);
 		}

app/resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgChapterLibraryMapper.java

@@ -17,11 +17,12 @@ public interface FgChapterLibraryMapper extends BaseMapper<ChapterLibrary> {
 	@Select("select max(orderNum) from res_chapter_library where bookid = #{bookid}")
 	Integer selectMaxOrderNum(@Param("bookid")String bookid);
 	
-	@Select("select * from res_chapter_library where bookid = #{bookid} and orderNum = #{orderNum}")
+	@Select("select * from res_chapter_library b INNER JOIN  res_article_library a on a.markid = b.markid where b.bookid = #{bookid} and orderNum = #{orderNum}")
 	FgEbookChapterVO selectchapter(@Param("bookid")String bookid ,@Param("orderNum")Integer orderNum );
 
 	
-	@Select("select *,(select GROUP_CONCAT(DISTINCT c.resourcetype) from res_article_library a inner join res_resource_relation c on a.id = c.objectid where a.markid = b.markid ORDER BY c.resourcetype ) resourceType from res_chapter_library b where bookid = #{bookid} and orderNum != #{orderNum} order by orderNum asc, pdfNum asc")
+	@Select("select *,(select GROUP_CONCAT(DISTINCT c.resourcetype) from res_resource_relation c  where   a.id = c.objectid ORDER BY c.resourcetype  ) resourceType from res_chapter_library b" + 
+			" INNER JOIN  res_article_library a on a.markid = b.markid where b.bookid = #{bookid} and orderNum != #{orderNum} order by orderNum asc, pdfNum asc")
 	List<ChapterLibrary> selectchapterList(@Param("bookid")String bookid ,@Param("orderNum")Integer orderNum );
 	
 	@Select("select *,(select GROUP_CONCAT(DISTINCT c.resourcetype) from res_article_library a inner join res_resource_relation c on a.id = c.objectid where a.markid = b.markid ORDER BY c.resourcetype ) resourceType from res_chapter_library b where bookid = #{bookid} and orderNum != #{orderNum} and level = 0 order by orderNum asc, pdfNum asc")