--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ResourceRelationMapper.java

@@ -27,7 +27,7 @@ public interface ResourceRelationMapper  extends BaseMapper<ResourceRelation> {
 		    + "<if test='form.dtId != null'>"  
 		    + "and ad.dtId = #{form.dtId}"
 		    + "</if>"
-		    + " order by a.uploadTime ,a.sort desc"
+		    + " order by a.sort desc,a.uploadTime desc"
 		    + "</script>")
 	List<ImageLibraryListVO> query(@Param("form")QueryImageRelationLibraryForm form);
 	

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

@@ -23,7 +23,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct id,name,sort,source,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,status,author "
+			+ "select id,name,sort,source,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,status,author "
 			+ "from res_Article_Library where 1=1 "
 			+ "<if test = '" + NOTBLANK + "(form.name)'>"  
 		    + " and name like concat('%',#{form.name},'%') "
@@ -31,7 +31,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 		    + "<if test='form.status != null'>"  
 		    + " and status = #{form.status}"
 		    + "</if>" 
-		    + " order by uploadTime,sort desc"
+		    + " order by sort desc,uploadTime desc"
 		    + "</script>")
 	List<ArticleLibraryListVO> query(@Param("form")QueryArticleLibraryForm form);
 	@Select("<script>" 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/imagelibrary/ImageLibraryMapper.java

@@ -24,7 +24,7 @@ public interface ImageLibraryMapper extends BaseMapper<ImageLibrary> {
 		    + "<if test='form.status != null'>"  
 		    + "and a.status = #{form.status}"
 		    + "</if>" 
-		    + " order by a.uploadTime,a.sort desc"
+		    + " order by a.sort desc,a.uploadTime desc"
 		    + "</script>")
 	List<ImageLibraryListVO> query(@Param("form")QueryImageLibraryForm form);
 	@Select("<script>" 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java

@@ -143,7 +143,7 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	@Select("SELECT MAX(sort) FROM res_video_library ")
 	Integer getMaxSort();
 	@Select("<script>" 
-			+ "select id,name,img cover,synopsis,timeLength,video from res_Video_Library where 1 = 1 and status=1 order by uploadTime,sort desc LIMIT 2"
+			+ "select id,name,img cover,synopsis,timeLength,video from res_Video_Library where 1 = 1 and status=1 order by sort desc,uploadTime desc LIMIT 2"
 		    + "</script>")
 	List<FgVideoLibraryListVO> list();
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -146,7 +146,7 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	@Override
 	public PageInfo<VideoLibraryListVO> page(QueryVideoLibraryForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy(" uploadTime,sort desc");
+			pageParam.setOrderBy(" sort desc,uploadTime desc");
 		}
 		startPage(pageParam);
 		List<VideoLibraryListVO> list = mapper.query(form);

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

@@ -14,7 +14,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	
 	@Select("<script>" 
 			+ "select a.id,a.name,a.img from res_Article_Library a  "
-			+ "where a.status = 1 order by a.uploadTime,a.sort desc"
+			+ "where a.status = 1 order by a.sort desc,a.uploadTime desc"
 		    + "</script>")
 	List<FgArticleLibraryListVO> list();
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/imagelibrary/FgImageLibraryMapper.java

@@ -19,7 +19,7 @@ public interface FgImageLibraryMapper extends BaseMapper <ImageLibrary>{
 	 * @date: 2019年1月11日 下午3:50:49
 	 */
 	@Select("<script>"
-			+ "select id,name, image FROM res_Image_Library WHERE status = 1 order by uploadTime,sort desc" 
+			+ "select id,name, image FROM res_Image_Library WHERE status = 1 order by sort desc,uploadTime desc" 
 			+ "</script>")
 	List<FgImageLibraryVO> list();
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/resourcerelation/FgResourceRelationMapper.java

@@ -21,7 +21,7 @@ public interface FgResourceRelationMapper  extends BaseMapper<ResourceRelation>
 		    + "<if test='form.dtId != null'>"  
 		    + "and ad.dtId = #{form.dtId}"
 		    + "</if>"
-		    + " order by a.uploadTime,a.sort desc"
+		    + " order by a.sort desc,a.uploadTime desc"
 		    + "</script>")
 	List<FgDiyTypeRelationListVo> list(@Param("form")FgQueryLibraryForm form);