From 0047be7a039a582f101b33560ff9b20a6a2a966d Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Fri, 16 Jan 2026 16:23:56 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:PartialDesign=E4=BC=A0=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8E=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/DesignItemServiceImpl.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
index 7072ffa8..ba0d3a9e 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -968,10 +968,20 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             } else if (Objects.isNull(item.getPartialDesign())
                     || StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignMinioPath())) {
                 if (designType.equals("merge")) {
-                    log.error("merge模式下，必须提供partialDesign");
-                    throw new BusinessException("required.partialDesign");
+                    // 先去数据库进行查找，如果数据库中也是空，则提示需要提供，否则无法生成
+                    DesignItemDetail designItemDetail = designItemDetailService.getById(item.getId());
+                    if (Objects.isNull(designItemDetail)){
+                        log.error("未知designItemDetailId: {}", item.getId());
+                        throw new BusinessException("designItemDetails.not.found");
+                    } else if (StringUtil.isNullOrEmpty(designItemDetail.getPartialDesign())) {
+                        log.error("merge模式下，必须提供partialDesign");
+                        throw new BusinessException("required.partialDesign");
+                    } else {
+                        item.setPartialDesign(new PartialDesignDTO(designItemDetail.getPartialDesign()));
+                    }
+                } else {
+                    item.setPartialDesign(new PartialDesignDTO(null));
                 }
-                item.setPartialDesign(new PartialDesignDTO(null));
             }
         });
     }