From 62e33a19fc64ee356f010376fe28d6c633837c28 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 17 Jan 2024 16:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=9B=BE=E4=B9=A6-=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=B7=B2=E8=B4=AD=E5=9B=BE=E4=B9=A6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=89=80=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/controller/BookController.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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); }