merge master

2023-10-18 17:16:45 +08:00
parent f1b072d6c3 8f7f785ba9
commit 19a2ef58a9
32 changed files with 216 additions and 259 deletions
--- a/src/main/java/com/peanut/modules/book/controller/BookController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookController.java
@@ -685,7 +685,9 @@ public class BookController {

        LambdaQueryWrapper<BookEntity> wrapper1 = new LambdaQueryWrapper<>();
        wrapper1.eq(BookEntity::getDelFlag,0);
-        wrapper1.in(BookEntity::getId,bookIds);
+        if(bookIds.size()>0){
+            wrapper1.in(BookEntity::getId,bookIds);
+        }
        Page<BookEntity> bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1);

        return R.ok().put("page",bookEntityPage);