--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/mapper/membercollection/FgBookShelfMapper.java

@@ -17,7 +17,7 @@ public interface FgBookShelfMapper extends BaseMapper<BookShelf> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select  r.id, r.resourceId, r.resourceType,r.uploadTime,b.synopsis,b.priceOption,b.realPrice,b.price,b.cover,b.browseNum,rb.name,ba.author,ba.authorId,qr.qrCode,rr.uploadTime "
+			+ "select  r.id, r.resourceId, r.resourceType,r.uploadTime,b.synopsis,b.priceOption,b.realPrice,b.price,b.cover,b.browseNum,rb.name,ba.author,ba.authorId,qr.qrCode,rr.uploadTime,r.uploadTime "
 			+ "from res_bookshelf r "
 			+ "left join res_ebook b on r.resourceId = b.id "
 			+ "left join res_book rb on b.id = rb.id "
@@ -26,7 +26,6 @@ public interface FgBookShelfMapper extends BaseMapper<BookShelf> {
 			+ "LEFT JOIN res_record rr ON r.resourceId = rr.goodsId "
 			+ "where b.bookStatus = 1 and r.memberId = #{memberId}"	
 			+ " like(rb.name,name) "
-			+ "order by rr.uploadTime desc "
 		    + "</script>")
 	List<FgBookShelfVo> selectAboutEbook(@Param("name")String name, @Param("memberId")String memberId);
 }

app/resource/src/main/java/com/zrqx/resource/fg/service/membercollection/FgBookShelfServiceImpl.java

@@ -72,7 +72,7 @@ public class FgBookShelfServiceImpl extends BaseServiceImpl<BookShelf, Integer>
 		Member member = fgRedisManage.getMember();
 		String memberId = member.getId().toString();
 		if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("uploadTime desc");
+			pageParam.setOrderBy("rr.uploadTime desc,r.uploadTime desc");
 		}
 		startPage(pageParam);
 		List<FgBookShelfVo> list = mapper.selectAboutEbook(name, memberId);