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 9632f37f..87a246e5 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -521,6 +521,7 @@ public class CollectionElementServiceImpl extends ServiceImpl printBoardElements = new ArrayList<>(); + elementVO.setPrintBoardElements(printBoardElements); if (!CollectionUtils.isEmpty(printBoardIds)) { // 从数据库批量查询printBoard元素 printBoardElements = collectionElementMapper.selectBatchIds(printBoardIds); @@ -528,7 +529,7 @@ public class CollectionElementServiceImpl extends ServiceImpl impleme getPrintboardLevel2TypeQw.lambda().orderByDesc(CollectionElement::getCreateDate); getPrintboardLevel2TypeQw.last("limit 1"); CollectionElement one = collectionElementService.getOne(getPrintboardLevel2TypeQw); - print.setLevel2Type(one.getLevel2Type()); + if (Objects.isNull(one)) { + QueryWrapper libraryQueryWrapper = new QueryWrapper<>(); + libraryQueryWrapper.lambda().eq(Library::getUrl, print.getPath()); + libraryQueryWrapper.lambda().orderByDesc(Library::getCreateDate); + getPrintboardLevel2TypeQw.last("limit 1"); + Library library = libraryService.getOne(libraryQueryWrapper); + if (Objects.isNull(library)) { + print.setLevel2Type("Pattern"); + } else { + print.setLevel2Type(library.getLevel2Type()); + } + } else { + print.setLevel2Type(one.getLevel2Type()); + } print.setCreateDate(LocalDateTime.now()); designItemDetailPrintService.save(print); }