--no commit message

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

@@ -21,7 +21,7 @@ public interface FgChapterLibraryMapper extends BaseMapper<ChapterLibrary> {
 	FgEbookChapterVO selectchapter(@Param("bookid")String bookid ,@Param("orderNum")Integer orderNum );
 
 	
-	@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" + 
+	@Select("select b.id,b.chapterName,b.parentId,b.bookId,b.bookName,b.orderNum,b.markId,b.level,b.pdfNum,a.text,(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 );