diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java index da00b9de..b4c62261 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java @@ -1,11 +1,6 @@ package cn.axzo.nanopart.doc.api.enums; -import static java.util.stream.Collectors.toList; - -import java.util.Arrays; -import java.util.List; - import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -30,9 +25,4 @@ public enum DatabaseScope { private final DatabaseType databaseType; private final boolean childrenNameDuplicatable; - public static List scopesWithDatabaseTypes() { - return Arrays.stream(values()) // - .filter(scope -> scope.databaseType != DatabaseType.NONE) // - .collect(toList()); - } } diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java index c0adf2a1..6d93a5e0 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java @@ -138,6 +138,7 @@ public class FileDatabaseService { private IndexNode checkTemplateDatabaseNode(String templateDatabaseCode) { IndexNode indexNode = indexManager.getOrThrow(templateDatabaseCode); BizAssertions.assertTrue(indexNode.isDatabase(), "只能选择资料库作为模板"); + BizAssertions.assertNotEquals(DatabaseType.NONE, indexNode.scope().getDatabaseType(), "无法添加空的资料库作为模板"); return indexNode; } @@ -230,7 +231,6 @@ public class FileDatabaseService { .in(CollectionUtils.isNotEmpty(searchWorkspaceIds), FileDatabase::getWorkspaceId, searchWorkspaceIds) .in(CollectionUtils.isNotEmpty(seachTemplateDatabaseCodes), FileDatabase::getTemplateDatabaseCode, seachTemplateDatabaseCodes) // .in(CollectionUtils.isNotEmpty(seachScopes), FileDatabase::getScope, seachScopes) - .in(FileDatabase::getScope, DatabaseScope.scopesWithDatabaseTypes()) .orderByDesc(FileDatabase::getId) .page(request.toPage()); // @formatter:on