--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/clauseLibrary/ClauseLibraryMapper.java

@@ -26,14 +26,21 @@ public interface ClauseLibraryMapper extends BaseMapper<ClauseLibrary>{
 	
 	/** 分页查询*/
 	@Select("<script>" 
+			+ "<if test='form.diyTypeCode == null'>"  
 				+ "select distinct a.id,a.content,a.bookName,"
 				+ "DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.status, "
 				+ "a.isDelete,g.dataSources from res_clause_Library a "
-			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)'>"  
-				+ "INNER JOIN res_clause_library_diy_type ad on a.id = ad.objectId "
+				+ "LEFT JOIN res_clause_goods g on a.id=g.objectId "
+				+ "where 1=1 and a.isDelete = 0 "
 			+ "</if>"
-			+ "INNER JOIN res_clause_goods g on a.id=g.objectId "
+			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)'>"  
+				+ "select distinct a.id,a.content,a.bookName,"
+				+ "DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.status, "
+				+ "a.isDelete,g.dataSources from res_clause_Library a "
+				+ "LEFT JOIN res_clause_library_diy_type ad on a.id = ad.objectId "
+				+ "LEFT JOIN res_clause_goods g on a.id=g.objectId "
 				+ "where 1=1 and a.isDelete = 0 "
+			+ "</if>"
 			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)'>"  
 		    	+ "and ad.code like concat(#{form.diyTypeCode},'%') "
 		    + "</if>"