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 281a2bdd..5396036e 100644 --- a/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java @@ -31,4 +31,6 @@ public class QueryLibraryPageServiceDTO extends PageQueryBaseVo { @ApiModelProperty("1交集2并集") private Integer intersection; + 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 0e5df05e..3fb9efb2 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -96,6 +96,9 @@ public class LibraryServiceImpl extends ServiceImpl impl @Resource private PythonTAllInfoService pythonTAllInfoService; + @Resource + private BrandRelLibraryMapper brandRelLibraryMapper; + private static List top = Arrays.asList(CollectionLevel2TypeEnum.DRESS.getRealName(), CollectionLevel2TypeEnum.OUTWEAR.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName()); private static List bottom = Arrays.asList(CollectionLevel2TypeEnum.SKIRT.getRealName(), @@ -155,6 +158,14 @@ public class LibraryServiceImpl extends ServiceImpl impl if (!StringUtils.isEmpty(query.getPictureName())) { queryWrapper.like("name", query.getPictureName()); } + + if (query.getBrandId() != null) { + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(BrandRelLibrary::getBrandId, query.getBrandId()); + Set collect = brandRelLibraryMapper.selectList(qw).stream().map(BrandRelLibrary::getLibraryId).collect(Collectors.toSet()); + queryWrapper.in("id", collect); + } + // 新增分类过滤 if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) { List libraryIdList = new ArrayList<>();