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().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().eq(CollectionElement::getId, sketchBoard.getSketchBoardId()).select(CollectionElement::getLevel3Type)).getLevel3Type(); if (!level3Type.equalsIgnoreCase(designDTO.getModelSex())) { sketchIterator.remove(); } + } //再次判断草图板数量,如果为null,则跳出当前if if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {