fix:点击我的喜欢会出现非喜欢的作品
fix:二创因为designID为-1导致报错的bug
This commit is contained in:
@@ -467,7 +467,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
|||||||
if (Objects.nonNull(query.getOrganizationId())) {
|
if (Objects.nonNull(query.getOrganizationId())) {
|
||||||
qw.eq("organization_id", query.getOrganizationId());
|
qw.eq("organization_id", query.getOrganizationId());
|
||||||
} else if (query.getGetMyPortfolio() == 0) {
|
} else if (query.getGetMyPortfolio() == 0) {
|
||||||
qw.isNull("is_public").or().eq("is_public", 1);
|
qw.eq("is_public", 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*List<Portfolio> topThree = new ArrayList<>();
|
/*List<Portfolio> topThree = new ArrayList<>();
|
||||||
@@ -742,6 +742,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
|||||||
.collect(Collectors.groupingBy(userLikeSnapshot -> userLikeSnapshot.getDesignItem().getDesignId()));
|
.collect(Collectors.groupingBy(userLikeSnapshot -> userLikeSnapshot.getDesignItem().getDesignId()));
|
||||||
userLikeMapByDesignId.forEach((designId, userLikeListOld1) -> {
|
userLikeMapByDesignId.forEach((designId, userLikeListOld1) -> {
|
||||||
Design design = designMapper.selectById(designId);
|
Design design = designMapper.selectById(designId);
|
||||||
|
//数据库中存在designId为-1的情况,此处值从workspace里取
|
||||||
|
if (design == null) {
|
||||||
|
design = new Design();
|
||||||
|
design.setSystemScale(BigDecimal.valueOf(workspaceOld.getSystemDesignerPercentage()).movePointLeft(2));
|
||||||
|
}
|
||||||
design.setId(null);
|
design.setId(null);
|
||||||
design.setCollectionId(collectionIdNew);
|
design.setCollectionId(collectionIdNew);
|
||||||
design.setAccountId(accountId);
|
design.setAccountId(accountId);
|
||||||
|
|||||||
Reference in New Issue
Block a user