bugfix:参与活动作品为0时查询出错
This commit is contained in:
@@ -1131,28 +1131,32 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
|||||||
List<PortfolioTags> portfolioTags = portfolioTagsMapper.selectList(queryWrapper);
|
List<PortfolioTags> portfolioTags = portfolioTagsMapper.selectList(queryWrapper);
|
||||||
List<Long> portfolioIdList = portfolioTags.stream().map(PortfolioTags::getPortfolioId).collect(Collectors.toList());
|
List<Long> portfolioIdList = portfolioTags.stream().map(PortfolioTags::getPortfolioId).collect(Collectors.toList());
|
||||||
|
|
||||||
QueryWrapper<Portfolio> qw = new QueryWrapper<>();
|
if (!portfolioIdList.isEmpty()){
|
||||||
qw.in("id", portfolioIdList);
|
QueryWrapper<Portfolio> qw = new QueryWrapper<>();
|
||||||
Page<Portfolio> portfolioPage = baseMapper.selectPage(new Page<>(page, size), qw);
|
qw.in("id", portfolioIdList);
|
||||||
// List<Portfolio> portfolios = baseMapper.selectList(qw);
|
Page<Portfolio> portfolioPage = baseMapper.selectPage(new Page<>(page, size), qw);
|
||||||
|
|
||||||
// 将 Portfolio 转换为 PortfolioVO 并进行相关处理
|
// 将 Portfolio 转换为 PortfolioVO 并进行相关处理
|
||||||
IPage<PortfolioVO> convert = portfolioPage.convert((Function<Portfolio, PortfolioVO>) portfolio -> {
|
IPage<PortfolioVO> convert = portfolioPage.convert((Function<Portfolio, PortfolioVO>) portfolio -> {
|
||||||
if (portfolio != null) {
|
if (portfolio != null) {
|
||||||
PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
|
PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
|
||||||
Canvas canvas = canvasMapper.selectById(vo.getCanvasId());
|
Canvas canvas = canvasMapper.selectById(vo.getCanvasId());
|
||||||
vo.setCanvasUrl(minioUtil.getPreSignedUrl(canvas.getUrl(), 24 * 60));
|
vo.setCanvasUrl(minioUtil.getPreSignedUrl(canvas.getUrl(), 24 * 60));
|
||||||
vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
|
vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
|
||||||
vo.setViewNums(redisUtil.getViewCount(vo.getId()));
|
vo.setViewNums(redisUtil.getViewCount(vo.getId()));
|
||||||
Long accountId = vo.getAccountId();
|
Long accountId = vo.getAccountId();
|
||||||
vo.setUserName(accountMapper.selectById(accountId).getUserName());
|
vo.setUserName(accountMapper.selectById(accountId).getUserName());
|
||||||
if (vo.getOriginal() == 0) {
|
if (vo.getOriginal() == 0) {
|
||||||
vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName());
|
vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName());
|
||||||
|
}
|
||||||
|
return vo;
|
||||||
}
|
}
|
||||||
return vo;
|
return null;
|
||||||
}
|
});
|
||||||
return null;
|
return PageBaseResponse.success(convert);
|
||||||
});
|
}else {
|
||||||
return PageBaseResponse.success(convert);
|
return PageBaseResponse.success(new Page<>());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user