diff --git a/src/main/java/com/ai/da/model/vo/ProjectVO.java b/src/main/java/com/ai/da/model/vo/ProjectVO.java index 1ce50b3d..abc0c797 100644 --- a/src/main/java/com/ai/da/model/vo/ProjectVO.java +++ b/src/main/java/com/ai/da/model/vo/ProjectVO.java @@ -19,4 +19,7 @@ public class ProjectVO extends Project { // @Schema(description = "更新时间") private Long updateDate; + + private String originalAccountName; + private String originalPortfolioName; } diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 02b14ead..30b7cf5d 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1967,7 +1967,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl> finalGroupDetailMap = groupDetailMap; IPage convert = page.convert((Function) project -> { if (project != null) { + 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(); projectVO.setUpdateDate(orderTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); @@ -1990,14 +1996,14 @@ public class UserLikeGroupServiceImpl extends ServiceImpl