--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/annexlibrary/FgAnnexLibraryMapper.java

@@ -20,19 +20,19 @@ public interface FgAnnexLibraryMapper extends BaseMapper<AnnexLibrary> {
 			+ "</script>") 
 	List<FgIndexAnnexListVO> list();
 	@Select("<script>"
-			+ "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
+			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"  
 				+ "SELECT bb.id, bb.name,bb.cover "
 				+ "FROM res_Annex_Library bb  LEFT JOIN res_Annex_Library_Diy_Type bdt ON bb.id = bdt.annexId"
 			+ "</if>"
-			+ "<if test='diyTypeCode==null' >"  
+			+ "<if test='form.diyTypeCode==null' >"  
 				+ "SELECT bb.id, bb.name,bb.cover FROM res_Annex_Library bb "
 			+ "</if>"
 	        + " WHERE 1=1 and bb.status = '1' " 
-	        + "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
-			+ " and bdt.code like concat(#{diyTypeCode},'%') "
+	        + "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"  
+			+ " and bdt.code like concat(#{form.diyTypeCode},'%') "
 			+ "</if>" 
-			+ "<if test = '"+ NOTBLANK +"(keywords)' >"  
-			+ " and bb.name like concat('%',#{keywords}, '%') "
+			+ "<if test = '"+ NOTBLANK +"(form.keywords)' >"  
+			+ " and bb.name like concat('%',#{form.keywords}, '%') "
 			+ "</if>"
 			+ "</script>")
 	List<FgSearchListVO> pc_page(@Param("form")Pc_FgQueryForm form);

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java

@@ -74,7 +74,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	List<FgIndexArticleListVO> list();
 
 	@Select("<script>" 
-			+ " select a.id,a.name,a.img cover,a.synopsis "
+			+ " select a.id,a.name,a.img cover,a.synopsis,a.uploadTime newPulishDate "
 			+ " from res_Article_Library a left join res_Article_Library_Diy_Type ad "
 			+ " on a.id = ad.alid "
 			+ " where 1=1 and a.status = 1 "