From 8f53902d18bb4b58a485437c89b9a8b0d16f4341 Mon Sep 17 00:00:00 2001
From: litianxiang <litianxiangxtt@163.com>
Date: Tue, 16 Sep 2025 17:21:47 +0800
Subject: [PATCH] =?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<PortfolioMapper, Portfolio
         if (Objects.nonNull(query.getOrganizationId())) {
             qw.eq("organization_id", query.getOrganizationId());
         } else if (query.getGetMyPortfolio() == 0) {
-            qw.isNull("is_public").or().eq("is_public", 1);
+            qw.eq("is_public", 1);
         }
 
         /*List<Portfolio> topThree = new ArrayList<>();
@@ -742,6 +742,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                     .collect(Collectors.groupingBy(userLikeSnapshot -> 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);