From 5fa7e36dc255d62a4942d95e5dd84a8e7154e735 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Thu, 4 Jul 2024 13:02:47 +0800
Subject: [PATCH] BUGFIX:aida;

---
 .../ai/da/service/impl/PortfolioServiceImpl.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
index 9742ebc1..77d17650 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -174,7 +174,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                     portfolio.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId());
                 }else {
                     portfolio.setOriginal(1);
-                    portfolio.setOriginalAccountId(authPrincipalVo.getId());
+//                    portfolio.setOriginalAccountId(authPrincipalVo.getId());
                 }
                 portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
                 portfolio.setPortfolioType("History");
@@ -259,6 +259,15 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                 if (!CollectionUtils.isEmpty(portfolios)) {
                     portfolio = portfolios.get(0);
                 }
+                UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
+                if (userLikeGroup.getOriginal() == 0) {
+                    portfolio.setOriginal(0);
+                    portfolio.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
+                    portfolio.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId());
+                }else {
+                    portfolio.setOriginal(1);
+//                    portfolio.setOriginalAccountId(authPrincipalVo.getId());
+                }
                 portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
                 portfolio.setPortfolioType("Canvas");
                 portfolio.setAccountId(authPrincipalVo.getId());
@@ -507,11 +516,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
         userLikeGroupNew.setCreateDate(new Date());
         if (portfolio.getOriginal() == 1) {
             if (Objects.equals(portfolio.getAccountId(), authPrincipalVo.getId())) {
+                userLikeGroupNew.setOriginal(1);
+            }else {
                 userLikeGroupNew.setOriginal(0);
                 userLikeGroupNew.setOriginalAccountId(portfolio.getAccountId());
                 userLikeGroupNew.setOriginalPortfolioId(portfolio.getId());
-            }else {
-                userLikeGroupNew.setOriginal(1);
             }
         }else {
             userLikeGroupNew.setOriginal(0);