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 b4c62261..da00b9de 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,6 +1,11 @@ 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; @@ -25,4 +30,9 @@ 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 fbc43146..c0adf2a1 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 @@ -230,7 +230,7 @@ public class FileDatabaseService { .in(CollectionUtils.isNotEmpty(searchWorkspaceIds), FileDatabase::getWorkspaceId, searchWorkspaceIds) .in(CollectionUtils.isNotEmpty(seachTemplateDatabaseCodes), FileDatabase::getTemplateDatabaseCode, seachTemplateDatabaseCodes) // .in(CollectionUtils.isNotEmpty(seachScopes), FileDatabase::getScope, seachScopes) - .ne(FileDatabase::getScope, IndexNodeScope.ANONYMOUS) + .in(FileDatabase::getScope, DatabaseScope.scopesWithDatabaseTypes()) .orderByDesc(FileDatabase::getId) .page(request.toPage()); // @formatter:on