--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -98,9 +98,6 @@ public class FgEbookController {
 	@ApiOperation("查询电子书分页列表")
 	@GetMapping("/page")
 	public CallBack<PageInfo<FgEbookListVO>> getBookPage(FgQueryEbookInfoForm form, PageParam pageParam) {
-		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
-			pageParam.setOrderBy("uploadTime desc,id desc");
-		}
 		List<FgEbookListVO> list = ebookservice.page(form, pageParam);
 		//查看促销活动，修改成活动价格
 		queryPromotionInfo(list);

app/resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java

@@ -202,6 +202,9 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 
 	@Override
 	public List<FgEbookListVO> page(FgQueryEbookInfoForm form, PageParam pageParam) {
+		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
+			pageParam.setOrderBy("be.uploadTime desc");
+		}
 		startPage(pageParam);
 		List<FgEbookListVO> list = ebookMapper.page(form);
 		// 调用