From a08744f71ae6476d1a04bd76a21e3a45191ee164 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 1 Apr 2025 15:42:15 +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

---
 .../java/com/ai/da/controller/WorkspaceController.java   | 4 ++--
 .../java/com/ai/da/mapper/primary/entity/Workspace.java  | 2 ++
 src/main/java/com/ai/da/service/WorkspaceService.java    | 2 +-
 .../com/ai/da/service/impl/WorkspaceServiceImpl.java     | 9 ++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/WorkspaceController.java b/src/main/java/com/ai/da/controller/WorkspaceController.java
index c22f5436..cf3f6ae4 100644
--- a/src/main/java/com/ai/da/controller/WorkspaceController.java
+++ b/src/main/java/com/ai/da/controller/WorkspaceController.java
@@ -96,8 +96,8 @@ public class WorkspaceController {
     @GetMapping("/getMannequins")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "获取模特")
-    public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style) {
-        List<ModelsVO> modelsVO = workspaceService.getMannequins(sex, style);
+    public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style, @RequestParam("ageGroup") String ageGroup) {
+        List<ModelsVO> modelsVO = workspaceService.getMannequins(sex, style, ageGroup);
         return Response.success(modelsVO);
     }
 
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java b/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java
index 89694294..1fea7108 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java
@@ -44,6 +44,8 @@ public class Workspace implements Serializable {
      */
     @ApiModelProperty(value = "用户ID")
     private Long accountId;
+
+    private String ageGroup;
     /**
      * 性别
      */
diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java
index 4058dac9..a43947cd 100644
--- a/src/main/java/com/ai/da/service/WorkspaceService.java
+++ b/src/main/java/com/ai/da/service/WorkspaceService.java
@@ -45,7 +45,7 @@ public interface WorkspaceService extends IService<Workspace> {
 
     WorkspaceVO getByIdForProject(Long id);
 
-    List<ModelsVO> getMannequins(String sex, String style);
+    List<ModelsVO> getMannequins(String sex, String style, String ageGroup);
 
     void systemFileCopy();
 
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 9d0802fa..b48a28f4 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -397,13 +397,14 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
     }
 
     @Override
-    public List<ModelsVO> getMannequins(String sex, String style) {
+    public List<ModelsVO> getMannequins(String sex, String style, String ageGroup) {
         AuthPrincipalVo userInfo = UserContext.getUserHolder();
         List<ModelsVO> result = new ArrayList<>();
         QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
         libraryQueryWrapper.lambda().eq(Library::getAccountId, userInfo.getId());
         libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
         libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
+        libraryQueryWrapper.lambda().eq(Library::getLevel3Type, ageGroup);
         List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
         if (!CollectionUtils.isEmpty(libraries)) {
             List<ModelVO> modelVOList = new ArrayList<>();
@@ -426,9 +427,11 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
         sysFileQueryWrapper.lambda().eq(SysFile::getLevel2Type, sex);
         if (!StringUtils.isEmpty(style)) {
             sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style);
-        }else {
-            sysFileQueryWrapper.lambda().isNull(SysFile::getLevel3Type);
         }
+//        else {
+//            sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style);
+//            sysFileQueryWrapper.lambda().isNull(SysFile::getLevel3Type);
+//        }
         List<SysFile> sysFileList = sysFileMapper.selectList(sysFileQueryWrapper);
         if (!CollectionUtils.isEmpty(sysFileList)) {
             List<ModelVO> modelVOList = new ArrayList<>();