我的图书-修复已购图书显示所有

This commit is contained in:
wuchunlei
2024-01-17 16:56:37 +08:00
parent b3bef83b95
commit 62e33a19fc

View File

@@ -733,17 +733,18 @@ public class BookController {
wrapper.eq(UserEbookBuyEntity::getUserId,userId); wrapper.eq(UserEbookBuyEntity::getUserId,userId);
wrapper.groupBy(UserEbookBuyEntity::getBookId); wrapper.groupBy(UserEbookBuyEntity::getBookId);
List<Integer> bookIds = userEbookBuyService.getBaseMapper().selectList(wrapper).stream().map(UserEbookBuyEntity::getBookId).collect(Collectors.toList()); List<Integer> bookIds = userEbookBuyService.getBaseMapper().selectList(wrapper).stream().map(UserEbookBuyEntity::getBookId).collect(Collectors.toList());
Page<BookEntity> bookEntityPage = null;
if(bookIds.size()>0){
MPJLambdaWrapper<BookEntity> wrapper1 = new MPJLambdaWrapper<>(); MPJLambdaWrapper<BookEntity> wrapper1 = new MPJLambdaWrapper<>();
wrapper1.eq(BookEntity::getDelFlag,0); wrapper1.eq(BookEntity::getDelFlag,0);
if(bookIds.size()>0){
wrapper1.in(BookEntity::getId,bookIds); wrapper1.in(BookEntity::getId,bookIds);
}
if (type!=null){ if (type!=null){
wrapper1.selectAll(BookEntity.class); wrapper1.selectAll(BookEntity.class);
wrapper1.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId); wrapper1.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId);
wrapper1.eq(MedicaldesBook::getTypeId,type); wrapper1.eq(MedicaldesBook::getTypeId,type);
} }
Page<BookEntity> bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1); bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1);
}
return R.ok().put("page",bookEntityPage); return R.ok().put("page",bookEntityPage);
} }