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 e9d58161..b69dce14 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookController.java @@ -733,17 +733,18 @@ public class BookController { wrapper.eq(UserEbookBuyEntity::getUserId,userId); wrapper.groupBy(UserEbookBuyEntity::getBookId); List bookIds = userEbookBuyService.getBaseMapper().selectList(wrapper).stream().map(UserEbookBuyEntity::getBookId).collect(Collectors.toList()); - MPJLambdaWrapper wrapper1 = new MPJLambdaWrapper<>(); - wrapper1.eq(BookEntity::getDelFlag,0); + Page bookEntityPage = null; if(bookIds.size()>0){ + MPJLambdaWrapper wrapper1 = new MPJLambdaWrapper<>(); + wrapper1.eq(BookEntity::getDelFlag,0); wrapper1.in(BookEntity::getId,bookIds); + if (type!=null){ + wrapper1.selectAll(BookEntity.class); + wrapper1.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId); + wrapper1.eq(MedicaldesBook::getTypeId,type); + } + bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1); } - if (type!=null){ - wrapper1.selectAll(BookEntity.class); - wrapper1.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId); - wrapper1.eq(MedicaldesBook::getTypeId,type); - } - Page bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1); return R.ok().put("page",bookEntityPage); }