diff --git a/src/main/java/com/peanut/modules/book/controller/BookController.java b/src/main/java/com/peanut/modules/book/controller/BookController.java index 6facd2d1..54918dba 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookController.java @@ -204,13 +204,19 @@ public class BookController { for (UserEbookBuyEntity b :bookids){ bids.add(b.getBookId()); } - Integer start = (page-1)*limit; QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("t.can_listen",1); - wrapper.notIn("t1.Book_id",bids); - List bookEntities = bookDao.queryUserListenBooksNobuy(wrapper,start,limit); - Integer count = bookDao.queryUserListenBooksNobuyCount(wrapper); - return R.ok().put("books",bookEntities).put("count",count); + wrapper.eq("can_listen",1); + wrapper.notIn("id",bids); + Page bookEntityPage = bookService.getBaseMapper().selectPage(new Page(page, limit), wrapper); +// Integer start = (page-1)*limit; +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq("t.can_listen",1); +// wrapper.notIn("t1.Book_id",bids); +// List bookEntities = bookDao.queryUserListenBooksNobuy(wrapper,start,limit); +// Integer count = bookDao.queryUserListenBooksNobuyCount(wrapper); + + + return R.ok().put("page",bookEntityPage); } /**