--no commit message

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

@@ -209,20 +209,20 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 			+ "</script>") 
 	List<FgIndexEbookListVO> list();
 	@Select("<script>"
-			+ "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
+			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"  
 				+ "SELECT bb.id, bb.name,bb.price, bb.bookCover cover "
 				+ "FROM res_ebook bb  LEFT JOIN res_ebook_diy_type bdt ON bb.id = bdt.ebookid"
 			+ "</if>"
-			+ "<if test='diyTypeCode==null' >"  
+			+ "<if test='form.diyTypeCode==null' >"  
 				+ "SELECT bb.id, bb.name,bb.price, bb.bookCover cover "
 				+ " FROM res_ebook bb "
 			+ "</if>"
 	        + " WHERE 1=1 and bookStatus = '1' " 
-	        + "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
-			+ " and bdt.code like concat(#{diyTypeCode},'%') "
+	        + "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"  
+			+ " and bdt.code like concat(#{form.diyTypeCode},'%') "
 			+ "</if>" 
-			+ "<if test = '"+ NOTBLANK +"(keywords)' >"  
-			+ " and bb.name like concat('%',#{keywords}, '%') "
+			+ "<if test = '"+ NOTBLANK +"(form.keywords)' >"  
+			+ " and bb.name like concat('%',#{form.keywords}, '%') "
 			+ "</if>"
 			+ "</script>")
 	List<FgSearchListVO> pc_page(@Param("form")Pc_FgQueryForm form);