From 6772610129f8727ee0bbb1495ff5e6807a7ae8b7 Mon Sep 17 00:00:00 2001
From: litianxiang <litianxiangxtt@163.com>
Date: Fri, 3 Oct 2025 12:04:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A0=B9=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E6=80=A7=E5=88=AB?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=94=B7=E5=A5=B3=E6=9C=8D=E8=A3=85=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=EF=BC=8C=E5=90=A6=E5=88=99=E4=BC=9A=E9=80=A0=E6=88=90?=
 =?UTF-8?q?design=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CollectionElementServiceImpl.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
index 074ce39d..91b8dc45 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
@@ -244,7 +244,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
         collectionElementMapper.deleteBatchIds(ids);
     }
 
-    /** 该方法已不再使用 */
+    /**
+     * 该方法已不再使用
+     */
     @Deprecated
     @Override
     public GenerateCollectionItemVO generatePrint(CollectionGeneratePrintDTO generatePrintDTO) {
@@ -553,11 +555,17 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
             while (sketchIterator.hasNext()) {
                 CollectionSketchDTO sketchBoard = sketchIterator.next();
                 String level2Type = sketchBoard.getLevel2Type();
+                String level3Type = "";
+                if ("Collection".equals(sketchBoard.getDesignType())) {
+                    level3Type = collectionElementMapper.selectOne(new LambdaQueryWrapper<CollectionElement>().eq(CollectionElement::getId, sketchBoard.getSketchBoardId()).select(CollectionElement::getLevel3Type)).getLevel3Type();
+                } else if ("Library".equals(sketchBoard.getDesignType())){
+                    level3Type = libraryService.getById(sketchBoard.getSketchBoardId()).getLevel3Type();
+                }
                 //判断性别和当前project性别是否一致，不一致则移除
-                String level3Type = collectionElementMapper.selectOne(new LambdaQueryWrapper<CollectionElement>().eq(CollectionElement::getId, sketchBoard.getSketchBoardId()).select(CollectionElement::getLevel3Type)).getLevel3Type();
                 if (!level3Type.equalsIgnoreCase(designDTO.getModelSex())) {
                     sketchIterator.remove();
                 }
+
             }
             //再次判断草图板数量，如果为null，则跳出当前if
             if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {