From 16039baadd5c6f985b1db0b2e49f04089509fdbf Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 21 Dec 2023 16:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=AD=E5=8C=BB=E7=BB=8F=E5=85=B8=E5=92=8C=E5=8C=BB?=
 =?UTF-8?q?=E5=AD=A6=E7=BB=8F=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/peanut/modules/book/controller/BookController.java | 2 ++
 .../com/peanut/modules/book/controller/BookTeachController.java | 1 +
 .../com/peanut/modules/book/service/impl/BookServiceImpl.java   | 1 +
 3 files changed, 4 insertions(+)

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<BookEntity> 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<BookEntity> 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<BookEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BookEntity::getTeachIn,1);
         wrapper.eq(BookEntity::getDelFlag,0);
+        wrapper.eq(BookEntity::getBookType,0);
         wrapper.notExists(exist_sql);
         Page<BookEntity> 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<BookDao, BookEntity> implements
         LambdaQueryWrapper<BookEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BookEntity::getClockIn, 1);
         wrapper.eq(BookEntity::getDelFlag, 0);
+        wrapper.eq(BookEntity::getBookType, 0);
         wrapper.notExists(exist_sql);
         Page<BookEntity> bookEntityPage = this.getBaseMapper().selectPage(new Page<BookEntity>(page, limit), wrapper);
         return bookEntityPage;