From 552ec828ab5d9ad3dce67ff2b252ee2cdb6cbad7 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 18 Aug 2025 16:18:51 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:1=E3=80=81=E5=88=A0=E9=99=A4=E6=A8=A1?= =?UTF-8?q?=E7=89=B9=E5=90=8E=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=202?= =?UTF-8?q?=E3=80=81=E8=8E=B7=E5=8F=96=E4=B8=AA=E4=BA=BA=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E7=89=B9=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/controller/LibraryController.java | 3 ++- .../ai/da/service/impl/LibraryServiceImpl.java | 9 +++++++-- .../da/service/impl/UserLikeGroupServiceImpl.java | 4 ++-- .../ai/da/service/impl/WorkspaceServiceImpl.java | 15 ++++++++++----- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index a86ec745..1b527f44 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -168,7 +169,7 @@ public class LibraryController { @ApiOperation(value = "更新sketchboard level2type") @PostMapping("/updateLibraryLevel2Type") - public Response updateLibraryLevel2Type(@RequestBody LibraryLevel2TypeUpdateDTO libraryLevel2TypeUpdateDTO) { + public Response updateLibraryLevel2Type(@Validated @RequestBody LibraryLevel2TypeUpdateDTO libraryLevel2TypeUpdateDTO) { return Response.success(libraryService.updateLibraryLevel2Type(libraryLevel2TypeUpdateDTO)); } 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 5bc2ce49..1bc0e725 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -171,7 +171,12 @@ public class LibraryServiceImpl extends ServiceImpl impl if (!StringUtils.isEmpty(query.getAgeGroup())) { // queryWrapper.eq("level3_type", query.getAgeGroup()); - queryWrapper.eq("age_group", query.getAgeGroup()); +// queryWrapper.eq("age_group", query.getAgeGroup()); + queryWrapper.lambda().and(wrapper -> wrapper + .eq(Library::getLevel3Type, query.getAgeGroup()) + .or() + .eq(Library::getAgeGroup, query.getAgeGroup()) + ); } if (query.getBrandId() != null) { @@ -892,7 +897,7 @@ public class LibraryServiceImpl extends ServiceImpl impl Library library = CopyUtil.copyObject(sysFile, Library.class); library.setId(null); library.setAccountId(accountId); - library.setLevel3Type(sysFileExtra.getAgeGroup()); + library.setAgeGroup(sysFileExtra.getAgeGroup()); library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD)); List imagesWidthAndHeight = minioUtil.getImagesWidthAndHeight(sysFile.getUrl()); library.setWidth(imagesWidthAndHeight.get(0)); 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 037dafaf..bfc5f0a1 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -2557,12 +2557,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl collectionElementRelModels = collectionElementMapper.selectByProject(projectId); List mannequin = moduleSaveDTO.getMannequin(); - List inputMannequinId = mannequin.stream().map(MannequinDTO::getId).collect(Collectors.toList()); + List inputMannequinId = mannequin.stream().map(MannequinDTO::getCollectionElementId).collect(Collectors.toList()); // 创建relationId到Model的映射 Map relationIdToModelMap = collectionElementRelModels.stream() .collect(Collectors.toMap( - CollectionElementRelModel::getRelationId, + CollectionElementRelModel::getCollectionElementId, java.util.function.Function.identity(), (existing, replacement) -> existing )); 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 cbf9c605..65a22ee0 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -416,11 +416,16 @@ public class WorkspaceServiceImpl extends ServiceImpl result = new ArrayList<>(); QueryWrapper 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); - libraryQueryWrapper.lambda().orderByDesc(Library::getCreateDate); + libraryQueryWrapper.lambda() + .eq(Library::getAccountId, userInfo.getId()) + .eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName()) + .eq(Library::getLevel2Type, sex) + .and(wrapper -> wrapper + .eq(Library::getLevel3Type, ageGroup) + .or() + .eq(Library::getAgeGroup, ageGroup) + ) + .orderByDesc(Library::getCreateDate); List libraries = libraryMapper.selectList(libraryQueryWrapper); if (!CollectionUtils.isEmpty(libraries)) { List modelVOList = new ArrayList<>();