From fbc473735c153af749ff1173cce19d6bffeef9e3 Mon Sep 17 00:00:00 2001
From: litianxiang <litianxiangxtt@163.com>
Date: Mon, 15 Dec 2025 15:41:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AF=B9=E6=B2=A1=E6=9C=89like?=
 =?UTF-8?q?=E7=9A=84=E5=B7=B2=E5=8F=91=E5=B8=83=E4=BD=9C=E5=93=81=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BA=8C=E5=88=9B=EF=BC=8C=E4=BC=9A=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8E=9F=E4=BD=9C=E8=80=85=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/model/vo/ProjectVO.java    |  3 +++
 .../impl/UserLikeGroupServiceImpl.java        | 22 ++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

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<UserLikeGroupMapper, U
         Map<Long, List<UserLikeVO>> finalGroupDetailMap = groupDetailMap;
         IPage<ProjectVO> convert = page.convert((Function<Project, ProjectVO>) 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<UserLikeGroupMapper, U
                     } else {
                         userLikeGroupVO.setSketchCount(0);
                     }
-                    if (userLikeGroupVO.getOriginal() == 0) {
-                        userLikeGroupVO.setOriginalAccountName(accountMapper.selectById(userLikeGroupVO.getOriginalAccountId()).getUserName());
-                        Portfolio byId = portfolioMapper.getByIdAll(userLikeGroupVO.getOriginalPortfolioId());
-                        if (Objects.nonNull(byId)) {
-                            String portfolioName = byId.getPortfolioName();
-                            userLikeGroupVO.setOriginalPortfolioName(portfolioName);
-                        }
-                    }
+//                    if (userLikeGroupVO.getOriginal() == 0) {
+//                        userLikeGroupVO.setOriginalAccountName(accountMapper.selectById(userLikeGroupVO.getOriginalAccountId()).getUserName());
+//                        Portfolio byId = portfolioMapper.getByIdAll(userLikeGroupVO.getOriginalPortfolioId());
+//                        if (Objects.nonNull(byId)) {
+//                            String portfolioName = byId.getPortfolioName();
+//                            userLikeGroupVO.setOriginalPortfolioName(portfolioName);
+//                        }
+//                    }
                     projectVO.setUserLikeGroupVO(userLikeGroupVO);
                 }
                 return projectVO;