From dd8f5696a2f2ffb99b2ebae2e080c6583e469a27 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Fri, 28 Jun 2024 16:52:16 +0800
Subject: [PATCH] BUGFIX:aida;

---
 .../ai/da/mapper/primary/entity/Portfolio.java   |  4 ++++
 .../da/mapper/primary/entity/UserLikeGroup.java  |  4 ++++
 .../ai/da/service/impl/PortfolioServiceImpl.java | 16 +++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java b/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java
index 8f15354a..f8cff637 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java
@@ -47,6 +47,10 @@ public class Portfolio implements Serializable {
     @ApiModelProperty(value = "是否允许二次创作1允许0不允许")
     private Integer openSource;
 
+    private Integer original;
+
+    private Long originalAccountId;
+
     @ApiModelProperty(value = "作品集作者ID")
     private Long accountId;
 
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java b/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java
index 2aa8cc0e..1747c83b 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java
@@ -43,6 +43,10 @@ public class UserLikeGroup implements Serializable {
      */
     private String name;
 
+    private Integer original;
+
+    private Long originalAccountId;
+
     /**
      * 创建时间
      */
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 fb7a43f3..664e73de 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -110,7 +110,8 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
 
             if (portfolioDTO.getOpenSource() == 1) {
                 UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
-                UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
+                UserLikeGroup userLikeGroupNew = CopyUtil.copyObject(userLikeGroup, UserLikeGroup.class);
+                userLikeGroupNew.setId(null);
                 userLikeGroupNew.setAccountId(-1L);
                 Long collectionIdOld = userLikeGroup.getCollectionId();
                 Collection collectionOld = collectionMapper.selectById(collectionIdOld);
@@ -137,6 +138,13 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                 if (!CollectionUtils.isEmpty(portfolios)) {
                     portfolio = portfolios.get(0);
                 }
+                if (userLikeGroup.getOriginal() == 0) {
+                    portfolio.setOriginal(0);
+                    portfolio.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
+                }else {
+                    portfolio.setOriginal(0);
+                    portfolio.setOriginalAccountId(authPrincipalVo.getId());
+                }
                 portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
                 portfolio.setPortfolioType("History");
                 portfolio.setCollectionId(collectionIdNew);
@@ -463,6 +471,12 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
         }
 //        UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById();
         UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
+        userLikeGroupNew.setOriginal(0);
+        if (portfolio.getOriginal() == 1) {
+            userLikeGroupNew.setOriginalAccountId(portfolio.getAccountId());
+        }else {
+            userLikeGroupNew.setOriginalAccountId(portfolio.getOriginalAccountId());
+        }
         userLikeGroupNew.setAccountId(authPrincipalVo.getId());
         Long collectionIdOld = userLikeGroup.getCollectionId();
         Collection collectionOld = collectionMapper.selectById(collectionIdOld);