fix:对没有like的已发布作品进行二创,会不显示原作者名字

This commit is contained in:
litianxiang
2025-12-15 15:41:58 +08:00
parent 9f48a2ce09
commit fbc473735c
2 changed files with 17 additions and 8 deletions

View File

@@ -19,4 +19,7 @@ public class ProjectVO extends Project {
// @Schema(description = "更新时间") // @Schema(description = "更新时间")
private Long updateDate; private Long updateDate;
private String originalAccountName;
private String originalPortfolioName;
} }

View File

@@ -1967,7 +1967,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
Map<Long, List<UserLikeVO>> finalGroupDetailMap = groupDetailMap; Map<Long, List<UserLikeVO>> finalGroupDetailMap = groupDetailMap;
IPage<ProjectVO> convert = page.convert((Function<Project, ProjectVO>) project -> { IPage<ProjectVO> convert = page.convert((Function<Project, ProjectVO>) project -> {
if (project != null) { if (project != null) {
ProjectVO projectVO = CopyUtil.copyObject(project, ProjectVO.class); ProjectVO projectVO = CopyUtil.copyObject(project, ProjectVO.class);
if(project.getOriginal() == 0){
//非原创
projectVO.setOriginalAccountName(accountMapper.selectById(project.getOriginalAccountId()).getUserName());
projectVO.setOriginalPortfolioName(portfolioMapper.getByIdAll(project.getOriginalPortfolioId()).getPortfolioName());
}
// 用于排序的时间 // 用于排序的时间
LocalDateTime orderTime = Objects.isNull(project.getUpdateTime()) ? project.getCreateTime() : project.getUpdateTime(); LocalDateTime orderTime = Objects.isNull(project.getUpdateTime()) ? project.getCreateTime() : project.getUpdateTime();
projectVO.setUpdateDate(orderTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); projectVO.setUpdateDate(orderTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
@@ -1990,14 +1996,14 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
} else { } else {
userLikeGroupVO.setSketchCount(0); userLikeGroupVO.setSketchCount(0);
} }
if (userLikeGroupVO.getOriginal() == 0) { // if (userLikeGroupVO.getOriginal() == 0) {
userLikeGroupVO.setOriginalAccountName(accountMapper.selectById(userLikeGroupVO.getOriginalAccountId()).getUserName()); // userLikeGroupVO.setOriginalAccountName(accountMapper.selectById(userLikeGroupVO.getOriginalAccountId()).getUserName());
Portfolio byId = portfolioMapper.getByIdAll(userLikeGroupVO.getOriginalPortfolioId()); // Portfolio byId = portfolioMapper.getByIdAll(userLikeGroupVO.getOriginalPortfolioId());
if (Objects.nonNull(byId)) { // if (Objects.nonNull(byId)) {
String portfolioName = byId.getPortfolioName(); // String portfolioName = byId.getPortfolioName();
userLikeGroupVO.setOriginalPortfolioName(portfolioName); // userLikeGroupVO.setOriginalPortfolioName(portfolioName);
} // }
} // }
projectVO.setUserLikeGroupVO(userLikeGroupVO); projectVO.setUserLikeGroupVO(userLikeGroupVO);
} }
return projectVO; return projectVO;