--no commit message

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

@@ -28,9 +28,14 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 	 * @date 2018年6月15日 下午2:33:32
 	 */
 	@Select("<script>"
-			+ "SELECT "
-			+ " bb.id,bb.name,bb.author,bb.isbn,bb.price, bb.uploadTime,bb.bookStatus "
-			+ " 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.author,bb.isbn,bb.price, bb.uploadTime,bb.bookStatus "
+				+ " FROM res_ebook bb  LEFT JOIN res_ebook_diy_type bdt ON bb.id = bdt.ebookid"
+			+ "</if>"
+			+ "<if test='diyTypeCode==null' >"  
+				+ "SELECT  bb.id,bb.name,bb.author,bb.isbn,bb.price, bb.uploadTime,bb.bookStatus "
+				+ " FROM res_ebook bb "
+			+ "</if>"
 	        + " WHERE 1 = 1 " 
 			+ "<if test='bookStatus!=null'>"
 			+ " AND bb.bookStatus = #{bookStatus} "