--no commit message

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

@@ -76,16 +76,15 @@ public interface ClauseLibraryMapper extends BaseMapper<ClauseLibrary>{
 				+ "where 1=1 and a.isDelete = 0 "
 		    + "</if>"
 		    + "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"  
-			    + "select distinct a.id,a.content name,a.bookName author,g.price,g.sellingPrice,a.resourceType as type,DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.status,a.isDelete "
+			    + "select distinct a.id,a.content as name,a.bookName author,a.resourceType as type,DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.status,a.isDelete "
 				+ "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 "
+				+ "on a.id = ad.objectId where 1=1 and a.isDelete = 0 "
 		    + "</if>"
 			+ "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"  
 		    + "and ad.code like concat(#{form.diyTypeCode},'%') "
 		    + "</if>"
 			+ "<if test='form.name != null and form.name != \"\"'>"  
-		    + "and a.name like concat('%',#{form.name},'%') "
+		    + "and a.content like concat('%',#{form.name},'%') "
 		    + "</if>" 
 			+ "<if test='form.resourceType != null and form.resourceType != \"\"'>"  
 		    + "and a.resourceType like concat('%',#{form.resourceType},'%') "