diff --git a/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java b/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java index 5396036e..8c8c829c 100644 --- a/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java @@ -31,6 +31,8 @@ public class QueryLibraryPageServiceDTO extends PageQueryBaseVo { @ApiModelProperty("1交集2并集") private Integer intersection; + private String ageGroup; + private Long brandId; } diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 8de84945..98956f0a 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -167,6 +167,10 @@ public class LibraryServiceImpl extends ServiceImpl impl queryWrapper.like("name", query.getPictureName()); } + if (!StringUtils.isEmpty(query.getAgeGroup())) { + queryWrapper.eq("level3_type", query.getAgeGroup()); + } + if (query.getBrandId() != null) { QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(BrandRelLibrary::getBrandId, query.getBrandId()); diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index 3d9450f2..1536ffd3 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -2,6 +2,7 @@ package com.ai.da.service.impl; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.context.UserContext; +import com.ai.da.common.enums.CollectionLevel1TypeEnum; import com.ai.da.common.enums.LibraryLevel1TypeEnum; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.ResultEnum; @@ -84,6 +85,10 @@ public class WorkspaceServiceImpl extends ServiceImpl selectWorkspacePage(IPage page, WorkspaceVO workspace) { @@ -755,7 +760,21 @@ public class WorkspaceServiceImpl extends ServiceImpl