From 2a6d3c1b58b3f4be987df7e8e5bd692e9a8a66d0 Mon Sep 17 00:00:00 2001
From: litianxiang <litianxiangxtt@163.com>
Date: Thu, 6 Nov 2025 15:21:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9D=E6=AC=A1=E4=BB=8E=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E5=92=8C=E7=94=9F=E6=88=90=E7=9A=84=E7=BA=BF=E7=A8=BF?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=88=B7=E6=96=B0=E5=89=8D=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=A2=AB=E7=94=A8=E4=BA=8Edesign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CollectionElementServiceImpl.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 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 741b5e2c..6528d88a 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
@@ -644,7 +644,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
                 if (result) {
                     throw new BusinessException("sketchBoards.designType.cannot.be.empty");
                 }
-
+                List<CollectionElement> sketchBoardElements = new ArrayList<>();
                 // 提取类型为COLLECTION的sketchBoard ID列表
                 List<Long> sketchBoardIds = designDTO.getSketchBoards().stream()
                         .filter(f -> f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName()))
@@ -652,12 +652,12 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
                         .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(sketchBoardIds)) {
                     // 从数据库查询验证sketchBoard元素是否存在
-                    List<CollectionElement> sketchBoardElements = collectionElementMapper.selectBatchIds(sketchBoardIds);
+                    sketchBoardElements = collectionElementMapper.selectBatchIds(sketchBoardIds);
+
                     if (CollectionUtil.isEmpty(sketchBoardElements) || sketchBoardElements.size() != sketchBoardIds.size()) {
                         throw new BusinessException("get.sketchBoards.data.is.mismatch");
                     }
-                    // 设置验证通过的sketchBoard元素到结果对象
-                    elementVO.setSketchBoardElements(sketchBoardElements);
+
                     // 记录已使用的元素ID
                     usedElementIds.addAll(sketchBoardIds);
                 }
@@ -675,7 +675,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
                         Map<Long, CollectionSketchDTO> idToMap = designDTO.getSketchBoards()
                                 .stream()
                                 .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v));
-                        libraryCollectionElements.addAll(covertLibrarysToCollections(librarys, idToMap));
+                        List<CollectionElement> librarysToCollections = covertLibrarysToCollections(librarys, idToMap);
+                        libraryCollectionElements.addAll(librarysToCollections);
+                        sketchBoardElements.addAll(librarysToCollections);
                     }
                 }
 
@@ -691,9 +693,13 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
                         Map<Long, CollectionSketchDTO> idToMap = designDTO.getSketchBoards()
                                 .stream()
                                 .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v));
-                        generateCollectionElements.addAll(covertGeneratesToCollections(generateDetailList, idToMap));
+                        List<CollectionElement> generatesToCollections = covertGeneratesToCollections(generateDetailList, idToMap);
+                        generateCollectionElements.addAll(generatesToCollections);
+                        sketchBoardElements.addAll(generatesToCollections);
                     }
                 }
+                // 设置验证通过的sketchBoard元素到结果对象
+                elementVO.setSketchBoardElements(sketchBoardElements);
             }
         }
         //校验marketingSketch