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 5c1c2508..206fafdf 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookController.java @@ -254,6 +254,7 @@ public class BookController { // Integer start = (page-1)*limit; QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("can_listen",1); + wrapper.eq("book_type",0); if(bids.size()>0){ wrapper.notIn("id",bids); } @@ -714,6 +715,7 @@ public class BookController { LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(BookEntity::getDelFlag,0); wrapper1.eq(BookEntity::getState,1); + wrapper1.eq(BookEntity::getBookType,0); if(bookIds.size()>0){ wrapper1.notIn(BookEntity::getId,bookIds); } diff --git a/src/main/java/com/peanut/modules/book/controller/BookTeachController.java b/src/main/java/com/peanut/modules/book/controller/BookTeachController.java index ed94e402..83f3fa97 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookTeachController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookTeachController.java @@ -96,6 +96,7 @@ public class BookTeachController { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BookEntity::getTeachIn,1); wrapper.eq(BookEntity::getDelFlag,0); + wrapper.eq(BookEntity::getBookType,0); wrapper.notExists(exist_sql); Page bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(pageIdDto.getPage(), pageIdDto.getLimit()), wrapper); return R.ok().put("page",bookEntityPage); diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java index ef00ec9d..7d2d6fb2 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java @@ -603,6 +603,7 @@ public class BookServiceImpl extends ServiceImpl implements LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BookEntity::getClockIn, 1); wrapper.eq(BookEntity::getDelFlag, 0); + wrapper.eq(BookEntity::getBookType, 0); wrapper.notExists(exist_sql); Page bookEntityPage = this.getBaseMapper().selectPage(new Page(page, limit), wrapper); return bookEntityPage;