diff --git a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java index ce8601ee..65f28a86 100644 --- a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java @@ -20,6 +20,8 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) public class ProjectQueryDTO extends PageQueryBaseVo { + @ApiModelProperty("项目id") + private Long id; @ApiModelProperty("项目名称") private String projectName; diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index a3754c17..118ec156 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1174,6 +1174,8 @@ public class GenerateServiceImpl extends ServiceImpl i Integer reSort = userLikeGroupService.rearrangeChildSort(poseTransformation.getId(), CollectionType.POSE_TRANSFORM.getValue(), poseTransformDTO.getParentId(), poseTransformDTO.getUserLikeSortId()); toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort); + }else if (Objects.nonNull(poseTransformDTO.getIsDefaultLike()) && Objects.nonNull(poseTransformDTO.getParentId())){ + toProductImageResultVO.setParentId(poseTransformDTO.getParentId()); } if (flag){ diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 900a8e44..915cfc98 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -498,6 +498,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account_id", authPrincipalVo.getId()); + queryWrapper.eq("id", query.getId()); // queryWrapper.isNull("parent_id"); if (!StringUtils.isEmpty(query.getProjectName())) { queryWrapper.like("name", query.getProjectName());