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; + @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().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 userLikeList = userLikeService.getUserLikeList(portfolioDTO.getUserLikeGroupId()); + List userLikeList = userLikeService.getUserLikeList(userLikeGroupId); Long coverIdNew = null; Boolean flag = false;