--no commit message

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

@@ -16,7 +16,7 @@ import com.zrqx.core.vo.resource.fg.pc.index.FgSearchListVO;
 public interface FgAnnexLibraryMapper extends BaseMapper<AnnexLibrary> {
 	@Select("<script>"
 			+ "select id,name,cover,annex fileName FROM  res_Annex_Library   "  
-			+ "where status = 1  order by uploadTime desc LIMIT 5"
+			+ "where status = 1  order by downloadNum desc LIMIT 5"
 			+ "</script>") 
 	List<FgIndexAnnexListVO> list();
 	@Select("<script>"

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

@@ -24,7 +24,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 */
 	@Select("<script>" 
 			+ "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 "
+			+ "from res_article_library a left join res_article_library_diy_type ad "
 			+ "on a.id = ad.alid "
 			+ "where 1=1 "
 			+ "<if test = 'form.diyTypeCode != null' >"  
@@ -47,7 +47,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	
 	@Select("<script>" 
 			+ " select a.id,a.name,a.author,a.source,a.bookName,a.price,a.realPrice,a.uploadTime,a.status,a.img,a.resourceType "
-			+ " from res_Article_Library a left join res_Article_Library_Diy_Type ad "
+			+ " 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 "
 			
@@ -69,16 +69,21 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 		    + "</script>")
 	List<ArticleLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 	@Select("<script>" 
-			+ "select a.id,a.name,a.synopsis,a.img cover from res_Article_Library a where a.status=1 order by uploadTime desc LIMIT 8"
+			+ "select a.id,a.name,a.synopsis,a.img cover from res_article_library a where a.status=1 order by uploadTime desc LIMIT 8"
 		    + "</script>")
 	List<FgIndexArticleListVO> list();
 
 	@Select("<script>" 
-			+ " 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 "
+			+ "<if test = 'form.diyTypeCode == null' >"  
+				+ " select a.id,a.name,a.img cover,a.synopsis,a.uploadTime newPulishDate "
+				+ " from res_article_library a "
+			+ "</if>"
+			+ "<if test = 'form.diyTypeCode != null' >"  
+				+ " 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 "
+			+ "</if>"
 			+ " where 1=1 and a.status = 1 "
-			
 			+ "<if test = 'form.diyTypeCode != null' >"  
 			+ " and ad.code like concat('%', #{form.diyTypeCode},'%')"
 			+ "</if>"