From 8f53902d18bb4b58a485437c89b9a8b0d16f4341 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Tue, 16 Sep 2025 17:21:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E7=82=B9=E5=87=BB=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=96=9C=E6=AC=A2=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=9D=9E?= =?UTF-8?q?=E5=96=9C=E6=AC=A2=E7=9A=84=E4=BD=9C=E5=93=81=20fix=EF=BC=9A?= =?UTF-8?q?=E4=BA=8C=E5=88=9B=E5=9B=A0=E4=B8=BAdesignID=E4=B8=BA-1?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/PortfolioServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index 124dd3de..41b77f65 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -467,7 +467,7 @@ public class PortfolioServiceImpl extends ServiceImpl topThree = new ArrayList<>(); @@ -742,6 +742,11 @@ public class PortfolioServiceImpl extends ServiceImpl userLikeSnapshot.getDesignItem().getDesignId())); userLikeMapByDesignId.forEach((designId, userLikeListOld1) -> { Design design = designMapper.selectById(designId); + //数据库中存在designId为-1的情况，此处值从workspace里取 + if (design == null) { + design = new Design(); + design.setSystemScale(BigDecimal.valueOf(workspaceOld.getSystemDesignerPercentage()).movePointLeft(2)); + } design.setId(null); design.setCollectionId(collectionIdNew); design.setAccountId(accountId); From d5681298438a9fe0dbdeb035505be4388e0c596e Mon Sep 17 00:00:00 2001 From: litianxiang Date: Wed, 17 Sep 2025 15:19:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=A2=9E=E5=8A=A0projectID?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E4=BA=8C=E5=88=9B=E5=AF=BC=E8=87=B4=E6=9F=A5=E8=AF=A2=E5=88=B0?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/GenerateServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index a834f987..95d3cadc 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1738,7 +1738,7 @@ public class GenerateServiceImpl extends ServiceImpl i private void processParentId(PoseTransformationVO vo, PoseTransformation poseTransformation) { if (poseTransformation != null) { - ToProductImageResult productResult = getProductResultByPath(poseTransformation.getProductImage()); + ToProductImageResult productResult = getProductResultByPath(poseTransformation); if (productResult != null) { Long parentId = collectionSortService.getParentIdByElementIdAndElementType( productResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue()); @@ -1770,9 +1770,11 @@ public class GenerateServiceImpl extends ServiceImpl i } } - private ToProductImageResult getProductResultByPath(String minioPath) { + private ToProductImageResult getProductResultByPath(PoseTransformation poseTransformation) { QueryWrapper qw = new QueryWrapper<>(); - qw.lambda().eq(ToProductImageResult::getUrl, minioPath); + //增加projectID匹配，避免因为二创导致查询到多条记录 + qw.lambda().eq(ToProductImageResult::getProjectId, poseTransformation.getProjectId()); + qw.lambda().eq(ToProductImageResult::getUrl, poseTransformation.getUniqueId()); return toProductImageResultMapper.selectOne(qw); }