--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -20,9 +20,15 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
+			+ "<if test = 'form.diyTypeCode == null' >"
+			+ "select a.id,a.name,a.author,a.source,a.uploadTime,a.status "
+			+ "from res_Article_Library a "
+			 + "</if>"
+			+ "<if test = 'form.diyTypeCode != null' >"
 			+ "select a.id,a.name,a.author,a.source,a.uploadTime,a.status "
 			+ "from res_Article_Library a left join res_Article_Library_Diy_Type ad "
 			+ "on a.id = ad.alid "
+			 + "</if>"
 			+ "where 1=1 "
 			+ "<if test = 'form.diyTypeCode != null' >"  
 		    + " and ad.code like concat('%', #{form.diyTypeCode},'%'))"