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 dbbf180c..a4a24a55 100644 --- a/src/main/java/com/ai/da/model/dto/PortfolioDTO.java +++ b/src/main/java/com/ai/da/model/dto/PortfolioDTO.java @@ -14,6 +14,5 @@ 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 2237964c..2fc34dc5 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -13,8 +13,6 @@ import com.ai.da.mapper.primary.*; import com.ai.da.mapper.primary.entity.*; import com.ai.da.mapper.primary.entity.Collection; import com.ai.da.model.dto.*; -import com.ai.da.model.enums.Position; -import com.ai.da.model.enums.Sex; import com.ai.da.model.vo.*; import com.ai.da.service.*; import com.alibaba.fastjson.JSONObject; @@ -26,7 +24,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.base.Function; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -34,7 +31,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -295,11 +291,19 @@ public class PortfolioServiceImpl extends ServiceImpl().eq("project_id", portfolioDTO.getProjectId())); - if (Objects.isNull(likeGroup)){ + Long userLikeGroupId; + if (Objects.nonNull(portfolioDTO.getUserLikeGroupId())){ + userLikeGroupId = portfolioDTO.getUserLikeGroupId(); + } else if (Objects.nonNull(portfolioDTO.getProjectId())){ + UserLikeGroup likeGroup = userLikeGroupMapper.selectOne(new QueryWrapper().eq("project_id", portfolioDTO.getProjectId())); + if (Objects.isNull(likeGroup)){ + return null; + } + userLikeGroupId = likeGroup.getId(); + } else { return null; } - Long userLikeGroupId = likeGroup.getId(); + UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(userLikeGroupId); UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null); userLikeGroupNew.setAccountId(-1L);