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 sketchBoardElements = new ArrayList<>(); // 提取类型为COLLECTION的sketchBoard ID列表 List sketchBoardIds = designDTO.getSketchBoards().stream() .filter(f -> f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) @@ -652,12 +652,12 @@ public class CollectionElementServiceImpl extends ServiceImpl 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 idToMap = designDTO.getSketchBoards() .stream() .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v)); - libraryCollectionElements.addAll(covertLibrarysToCollections(librarys, idToMap)); + List librarysToCollections = covertLibrarysToCollections(librarys, idToMap); + libraryCollectionElements.addAll(librarysToCollections); + sketchBoardElements.addAll(librarysToCollections); } } @@ -691,9 +693,13 @@ public class CollectionElementServiceImpl extends ServiceImpl idToMap = designDTO.getSketchBoards() .stream() .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v)); - generateCollectionElements.addAll(covertGeneratesToCollections(generateDetailList, idToMap)); + List generatesToCollections = covertGeneratesToCollections(generateDetailList, idToMap); + generateCollectionElements.addAll(generatesToCollections); + sketchBoardElements.addAll(generatesToCollections); } } + // 设置验证通过的sketchBoard元素到结果对象 + elementVO.setSketchBoardElements(sketchBoardElements); } } //校验marketingSketch