--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/ebook/WapEbookController.java

@@ -77,7 +77,7 @@ public class WapEbookController {
 	@GetMapping(ResourceRequestPath.PAGE_BOOK)
 	public CallBack<PageInfo<FgArticleLibraryListVO>> getBookOrArticleList(FgQueryArticleLibraryForm form, PageParam pageParam) {
 		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
-			pageParam.setOrderBy("uploadTime desc");
+			pageParam.setOrderBy("year desc,periods asc,uploadTime desc");
 		}
 		List<FgArticleLibraryListVO> list=null;
 		if(form.getType().equals("1")) {

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/mapper/WapBookMapper.java

@@ -71,7 +71,7 @@ public interface WapBookMapper extends BaseMapper<Book> {
 			+ "select bb.id,bb.name, bb.year,bb.yearId, bb.periods, bb.bookCover,bb.status,bb.summary,bb.pdf,"
 			+ "bb.mainBody,bb.mainBodyId,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d %H:%m:%s') uploadTime "
 			+ "FROM res_book bb WHERE bb.status = 1 and bb.mainBodyId = #{oid} "
-			+ " order by bb.uploadTime desc LIMIT 0,4"
+			+ " order by year desc,periods asc,uploadTime desc LIMIT 0,4"
 			+ "</script>")
 	List<WapIndexEbookListVO> queryMainBody(@Param("oid") String oid);
 	@Select("<script>"