From 20f7dc0ef97243d4e89311b082a4541001f890a9 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 17 Jul 2025 17:21:14 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E4=BD=9C=E5=93=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86=E9=80=9A=E8=BF=87projectId?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2userLikeGroupId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/model/dto/PortfolioDTO.java  |  5 +++++
 .../da/service/impl/PortfolioServiceImpl.java   | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/model/dto/PortfolioDTO.java b/src/main/java/com/ai/da/model/dto/PortfolioDTO.java
index 640d3a57..dbbf180c 100644
--- a/src/main/java/com/ai/da/model/dto/PortfolioDTO.java
+++ b/src/main/java/com/ai/da/model/dto/PortfolioDTO.java
@@ -1,7 +1,10 @@
 package com.ai.da.model.dto;
 
 import com.ai.da.mapper.primary.entity.Portfolio;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
@@ -10,5 +13,7 @@ public class PortfolioDTO extends Portfolio {
 
     private List<TagsDTO> tagsDTO;
 
+    @ApiModelProperty("项目id")
+    @NotNull
     private Long projectId;
 }
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 7d90a37a..2237964c 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -147,9 +147,9 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             throw new BusinessException("The title of the published work has been used.");
         }
         // 判断用户是否参与#RCAworkshop_2024的活动
-        if (hasParticipatedRCAWorkshop(authPrincipalVo.getId(), portfolioDTO.getTagsDTO(), portfolioDTO.getId(), portfolioDTO.getUserLikeGroupId())){
-            throw new BusinessException("you.have.participated.in.the.event", ResultEnum.PROMPT.getCode());
-        }
+//        if (hasParticipatedRCAWorkshop(authPrincipalVo.getId(), portfolioDTO.getTagsDTO(), portfolioDTO.getId(), portfolioDTO.getUserLikeGroupId())){
+//            throw new BusinessException("you.have.participated.in.the.event", ResultEnum.PROMPT.getCode());
+//        }
         if (file != null && file.getOriginalFilename() != null) {
             Long portfolioId;
             // 上传画布到minio
@@ -295,7 +295,12 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             throw new BusinessException("The title of the published work has been used.");
         }
         if (portfolioDTO.getPortfolioType().equals("History")) {
-            UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
+            UserLikeGroup likeGroup = userLikeGroupMapper.selectOne(new QueryWrapper<UserLikeGroup>().eq("project_id", portfolioDTO.getProjectId()));
+            if (Objects.isNull(likeGroup)){
+                return null;
+            }
+            Long userLikeGroupId = likeGroup.getId();
+            UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(userLikeGroupId);
             UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
             userLikeGroupNew.setAccountId(-1L);
             Long collectionIdOld = userLikeGroup.getCollectionId();
@@ -316,7 +321,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                 collectionElementRelationNew.setElementId(element.getId());
                 collectionElementRelationMapper.insert(collectionElementRelationNew);
             }
-            Portfolio portfolio = getPortfolioByUserGroupIdSource(portfolioDTO.getUserLikeGroupId());
+            Portfolio portfolio = getPortfolioByUserGroupIdSource(userLikeGroupId);
             Long coverIdOld = portfolioDTO.getCoverId();
             portfolio.setPortfolioName(portfolioDTO.getPortfolioName());
 //        portfolio.setPortfolioType("History");
@@ -328,7 +333,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             portfolio.setIsDeleted(0);
             portfolioMapper.updateById(portfolio);
 
-            List<UserLike> userLikeList = userLikeService.getUserLikeList(portfolioDTO.getUserLikeGroupId());
+            List<UserLike> userLikeList = userLikeService.getUserLikeList(userLikeGroupId);
 
             Long coverIdNew = null;
             Boolean flag = false;