--no commit message

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

@@ -131,14 +131,17 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date: 2019年1月11日 下午3:50:49
 	 */
 	@Select("<script>"
-			+ "select bb.id, bb.name,bb.price, bb.bookCover, bb.bookImg FROM res_ebook bb "  
-	        + "LEFT JOIN res_ebook_diy_type bdt ON bb.id = bdt.ebookId "
+			+ "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
+				+ "SELECT bb.id, bb.name,bb.price, bb.bookCover, bb.bookImg "
+				+ "FROM res_ebook bb  LEFT JOIN res_ebook_diy_type bdt ON bb.id = bdt.ebookid"
+			+ "</if>"
+			+ "<if test='diyTypeCode==null' >"  
+				+ "bb.id, bb.name,bb.price, bb.bookCover, bb.bookImg "
+				+ " FROM res_ebook bb "
+			+ "</if>"
 	        + " WHERE 1=1" 
-			+ "<if test='diyTypeCode != null and diyTypeCode.size > 0'>"  
-			+ "and bdt.code in "
-			+ " <foreach collection=\"diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">" 
-			+ " concat(#{code},'%') " 
-			+ "</foreach>" 
+	        + "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
+			+ " and bdt.code like concat(#{diyTypeCode},'%') "
 			+ "</if>" 
 			+ "<if test = '"+ NOTBLANK +"(keywords)' >"  
 			+ " and bb.name like concat(#{keywords}, '%') "