--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -116,7 +116,7 @@ public class EbookController {
 		 list.add(book.getMainBodyId());
 		 list.add(book.getYearId());
 		 list.add(book.getPeriodsId());
-		vo.setMainBody(list);
+		 vo.setMainBody(list);
 		
 		/*vo.setMainBody(new ArrayList<String>());
 		vo.setYear(new ArrayList<String>());

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgBookMapper.java

@@ -53,12 +53,18 @@ public interface FgBookMapper extends BaseMapper<Book> {
 	 * @date: 2019年1月11日 下午3:50:49
 	 */
 	@Select("<script>"
-			+ "select bb.id,bb.year,bb.name,bb.periods,bb.status,bb.summary as synopsis,"
+			+ "select bb.id,bb.name,bb.mainBody,bb.year,bb.periods,bb.status,bb.summary as synopsis,"
 			+ "bb.keywords,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d') uploadTime "
 			+ "FROM res_book bb WHERE bb.status = 1 " 
 			+ "<if test = 'form.keywords != null' >"  
 			+ "and (bb.name like concat(#{form.keywords},'%') or bb.keywords like concat(#{form.keywords},'%'))"
 			+ "</if>" 
+			+ "<if test='year != null'>"  
+			+ "and bb.year = #{year} " 
+			+ "</if>" 
+			+ "<if test = 'mainBody != null' >"  
+			+ "and bb.mainBody = #{mainBody} "
+			+ "</if>" 
 			+ "</script>")
 	List<FgArticleLibraryListVO> pageBook(@Param("form")FgQueryArticleLibraryForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/mapper/WapBookMapper.java

@@ -44,12 +44,18 @@ public interface WapBookMapper extends BaseMapper<Book> {
 	 * @date: 2019年9月23日 上午10:46:00
 	 */
 	@Select("<script>"
-			+ "select bb.id,bb.year,bb.name,bb.periods,bb.status,bb.summary as synopsis,"
+			+ "select bb.id,bb.year,bb.name,bb.mainBody,bb.periods,bb.status,bb.summary as synopsis,"
 			+ "bb.keywords,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d') uploadTime "
 			+ "FROM res_book bb WHERE bb.status = 1 " 
 			+ "<if test = 'form.keywords != null' >"  
 			+ "and (bb.name like concat(#{form.keywords},'%') or bb.keywords like concat(#{form.keywords},'%'))"
 			+ "</if>" 
+			+ "<if test='year != null'>"  
+			+ "and bb.year = #{year} " 
+			+ "</if>" 
+			+ "<if test = 'mainBody != null' >"  
+			+ "and bb.mainBody = #{mainBody} "
+			+ "</if>" 
 			+ "</script>")
 	List<FgArticleLibraryListVO> pageBook(@Param("form")FgQueryArticleLibraryForm form);
 	/**