--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/annexlibrary/AnnexLibraryMapper.java

@@ -15,9 +15,15 @@ import com.zrqx.core.vo.resource.annexlibrary.AnnexLibraryListVO;
  */
 public interface AnnexLibraryMapper extends BaseMapper<AnnexLibrary> {
 	@Select("<script>" 
+			+ "<if test='form.diyTypeCode==null"  
+			+ "select a.id,a.name,a.source,a.uploadTime from res_annex_library a "
+			+ "</if>"
+			+ "<if test='" + NOTBLANK + "(form.diyTypeCode)'>"  
 			+ "select a.id,a.name,a.source,a.uploadTime "
 			+ "from res_annex_library a left join res_annex_library_Diy_Type ad "
-			+ "on a.id = ad.annexid where 1=1 "
+			+ "on a.id = ad.annexid "
+			+ "</if>"
+			+ "where 1=1 "
 			+ "<if test='" + NOTBLANK + "(form.diyTypeCode)'>"  
 		    + " and ad.code like concat(#{form.diyTypeCode},'%') "
 		    + "</if>"