Merge branch 'dev/3.1_release_merge' into release/3.1

This commit is contained in:
2025-09-02 22:28:58 +08:00

View File

@@ -540,6 +540,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
} }
vo.setCollectionElementList(collectionElementList); vo.setCollectionElementList(collectionElementList);
List<UserLikeSnapshot> userLikeList = projectSnapshot.getUserLikeList(); List<UserLikeSnapshot> userLikeList = projectSnapshot.getUserLikeList();
if (userLikeList != null && !userLikeList.isEmpty()){
List<TDesignPythonOutfit> list = new ArrayList<>(); List<TDesignPythonOutfit> list = new ArrayList<>();
for (UserLikeSnapshot userLikeSnapshot : userLikeList) { for (UserLikeSnapshot userLikeSnapshot : userLikeList) {
TDesignPythonOutfit designPythonOutfit = userLikeSnapshot.getDesignPythonOutfit(); TDesignPythonOutfit designPythonOutfit = userLikeSnapshot.getDesignPythonOutfit();
@@ -549,6 +550,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
vo.setDesignPythonOutfitList(list); vo.setDesignPythonOutfitList(list);
} }
} }
}
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()));