--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java

@@ -55,12 +55,12 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			
 			+ " eq(bb.type,form.type) "
 			+ " eq(be.bookType,form.bookType) "
-			+ " eq(be.status,form.status) "
+			+ " eq(bb.status,form.status) "
 			+ " like(bdt.code,form.diyTypeCode) "
 			
 			
-			+ "<if test='"+ NOTBLANK +"(nai)'>"
-			+ " AND (bb.name like concat('%',#{nai},'%')  OR bb.author like concat('%',#{nai},'%') OR bb.isbn like concat('%',#{nai},'%')) "
+			+ "<if test='"+ NOTBLANK +"(form.nai)'>"
+			+ " AND (bb.name like concat('%',#{form.nai},'%')  OR bb.author like concat('%',#{form.nai},'%') OR bb.isbn like concat('%',#{form.nai},'%')) "
 			+ "</if>"
 			
 			
@@ -68,11 +68,11 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			+ " like(bb.author,form.author) "
 			+ " like(bb.isbn,form.isbn) "
 			
-			+ "<if test='"+ NOTBLANK +"(beginTime)'>"
-			+ " AND be.uploadTime &gt;= concat(#{beginTime}, ' 00:00:00')"
+			+ "<if test='"+ NOTBLANK +"(form.beginTime)'>"
+			+ " AND be.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00')"
 			+ "</if>"
-			+ "<if test='beginTime!=null and endTime!=null'>"
-			+ " AND be.uploadTime &lt;= concat(#{endTime}, ' 23:59:59')"
+			+ "<if test='form.beginTime!=null and form.endTime!=null'>"
+			+ " AND be.uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
 			+ "</if>"
 		    + " order by be.uploadTime desc "
 			+ "</script>")