wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3540: 惹名scope的子节点名可以重复

Browse Source
This commit is contained in:
yanglin 2025-03-19 14:12:15 +08:00
parent f563fbd48e
commit e63e40c673
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java
View File

@ -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<DatabaseScope> scopesWithDatabaseTypes() {
return Arrays.stream(values()) //
.filter(scope -> scope.databaseType != DatabaseType.NONE) //
.collect(toList());
}
}

2
doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java
View File

@ -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