diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index e4a85177..239c5ac2 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -1131,28 +1131,32 @@ public class PortfolioServiceImpl extends ServiceImpl portfolioTags = portfolioTagsMapper.selectList(queryWrapper); List portfolioIdList = portfolioTags.stream().map(PortfolioTags::getPortfolioId).collect(Collectors.toList()); - QueryWrapper qw = new QueryWrapper<>(); - qw.in("id", portfolioIdList); - Page portfolioPage = baseMapper.selectPage(new Page<>(page, size), qw); -// List portfolios = baseMapper.selectList(qw); + if (!portfolioIdList.isEmpty()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.in("id", portfolioIdList); + Page portfolioPage = baseMapper.selectPage(new Page<>(page, size), qw); - // 将 Portfolio 转换为 PortfolioVO 并进行相关处理 - IPage convert = portfolioPage.convert((Function) portfolio -> { - if (portfolio != null) { - PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class); - Canvas canvas = canvasMapper.selectById(vo.getCanvasId()); - vo.setCanvasUrl(minioUtil.getPreSignedUrl(canvas.getUrl(), 24 * 60)); - vo.setLikeNum(redisUtil.getLikeCount(vo.getId())); - vo.setViewNums(redisUtil.getViewCount(vo.getId())); - Long accountId = vo.getAccountId(); - vo.setUserName(accountMapper.selectById(accountId).getUserName()); - if (vo.getOriginal() == 0) { - vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName()); + // 将 Portfolio 转换为 PortfolioVO 并进行相关处理 + IPage convert = portfolioPage.convert((Function) portfolio -> { + if (portfolio != null) { + PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class); + Canvas canvas = canvasMapper.selectById(vo.getCanvasId()); + vo.setCanvasUrl(minioUtil.getPreSignedUrl(canvas.getUrl(), 24 * 60)); + vo.setLikeNum(redisUtil.getLikeCount(vo.getId())); + vo.setViewNums(redisUtil.getViewCount(vo.getId())); + Long accountId = vo.getAccountId(); + vo.setUserName(accountMapper.selectById(accountId).getUserName()); + if (vo.getOriginal() == 0) { + vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName()); + } + return vo; } - return vo; - } - return null; - }); - return PageBaseResponse.success(convert); + return null; + }); + return PageBaseResponse.success(convert); + }else { + return PageBaseResponse.success(new Page<>()); + } + } }