From 33582922befe331b7f884cf84b866049faf08d19 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Thu, 27 Mar 2025 13:38:47 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/model/dto/QueryLibraryPageServiceDTO.java   |  2 ++
 .../com/ai/da/service/impl/LibraryServiceImpl.java    | 11 +++++++++++
 2 files changed, 13 insertions(+)

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<LibraryMapper, Library> impl
     @Resource
     private PythonTAllInfoService pythonTAllInfoService;
 
+    @Resource
+    private BrandRelLibraryMapper brandRelLibraryMapper;
+
     private static List<String> top = Arrays.asList(CollectionLevel2TypeEnum.DRESS.getRealName(),
             CollectionLevel2TypeEnum.OUTWEAR.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName());
     private static List<String> bottom = Arrays.asList(CollectionLevel2TypeEnum.SKIRT.getRealName(),
@@ -155,6 +158,14 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
         if (!StringUtils.isEmpty(query.getPictureName())) {
             queryWrapper.like("name", query.getPictureName());
         }
+
+        if (query.getBrandId() != null) {
+            QueryWrapper<BrandRelLibrary> qw = new QueryWrapper<>();
+            qw.lambda().eq(BrandRelLibrary::getBrandId, query.getBrandId());
+            Set<Long> collect = brandRelLibraryMapper.selectList(qw).stream().map(BrandRelLibrary::getLibraryId).collect(Collectors.toSet());
+            queryWrapper.in("id", collect);
+        }
+
         // 新增分类过滤
         if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) {
             List<Long> libraryIdList = new ArrayList<>();