Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitebdc031

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
Fix issue when folderId of getElements is null
1 parent0838e42 commitebdc031

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Mono<ResponseView<FolderInfoView>> create(@RequestBody Folder folder) {
4343
@Override
4444
publicMono<ResponseView<Void>>delete(@PathVariable("id")StringfolderId) {
4545
returngidService.convertFolderIdToObjectId(folderId).flatMap(objectId ->
46-
folderApiService.delete(objectId)
46+
folderApiService.delete(objectId.orElse(null))
4747
.delayUntil(f ->businessEventPublisher.publishFolderCommonEvent(f.getId(),f.getName(),EventType.FOLDER_DELETE))
4848
.then(Mono.fromSupplier(() ->ResponseView.success(null))));
4949
}
@@ -73,8 +73,9 @@ public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", require
7373
@RequestParam(required =false)Stringcategory,
7474
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
7575
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
76-
returngidService.convertFolderIdToObjectId(folderId).flatMap(objectId -> {
77-
varflux =folderApiService.getElements(objectId,applicationType,name,category).cache();
76+
returngidService.convertFolderIdToObjectId(folderId).flatMap(optionalObjectId -> {
77+
StringobjectId =optionalObjectId.orElse(null);
78+
varflux =folderApiService.getElements(optionalObjectId.orElse(null),applicationType,name,category).cache();
7879
varcountMono =flux.count();
7980
varflux1 =flux.skip((long) (pageNum -1) *pageSize);
8081
if (pageSize >0)flux1 =flux1.take(pageSize);
@@ -89,8 +90,8 @@ public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", require
8990
publicMono<ResponseView<Void>>move(@PathVariable("id")StringapplicationLikeId,
9091
@RequestParam(value ="targetFolderId",required =false)StringtargetFolderId) {
9192
returngidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId ->
92-
folderApiService.move(applicationLikeId,objectId)
93-
.then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId,objectId,APPLICATION_MOVE))
93+
folderApiService.move(applicationLikeId,objectId.orElse(null))
94+
.then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId,objectId.orElse(null),APPLICATION_MOVE))
9495
.then(Mono.fromSupplier(() ->ResponseView.success(null))));
9596
}
9697

@@ -104,7 +105,7 @@ public Mono<ResponseView<Void>> updatePermission(@PathVariable String folderId,
104105
}
105106

106107
returngidService.convertFolderIdToObjectId(folderId).flatMap(objectId ->
107-
folderApiService.updatePermission(objectId,permissionId,role)
108+
folderApiService.updatePermission(objectId.orElse(null),permissionId,role)
108109
.then(Mono.fromSupplier(() ->ResponseView.success(null))));
109110
}
110111

@@ -113,7 +114,7 @@ public Mono<ResponseView<Void>> removePermission(
113114
@PathVariableStringfolderId,
114115
@PathVariableStringpermissionId) {
115116
returngidService.convertFolderIdToObjectId(folderId).flatMap(objectId ->
116-
folderApiService.removePermission(objectId,permissionId)
117+
folderApiService.removePermission(objectId.orElse(null),permissionId)
117118
.then(Mono.fromSupplier(() ->ResponseView.success(null))));
118119
}
119120

@@ -126,14 +127,14 @@ public Mono<ResponseView<Void>> grantPermission(
126127
returnofError(INVALID_PARAMETER,"INVALID_PARAMETER",request.role());
127128
}
128129
returngidService.convertFolderIdToObjectId(folderId).flatMap(objectId ->
129-
folderApiService.grantPermission(objectId,request.userIds(),request.groupIds(),role)
130+
folderApiService.grantPermission(objectId.orElse(null),request.userIds(),request.groupIds(),role)
130131
.then(Mono.fromSupplier(() ->ResponseView.success(null))));
131132
}
132133

133134
@Override
134135
publicMono<ResponseView<ApplicationPermissionView>>getApplicationPermissions(@PathVariableStringfolderId) {
135136
returngidService.convertFolderIdToObjectId(folderId).flatMap(objectId ->
136-
folderApiService.getPermissions(objectId)
137+
folderApiService.getPermissions(objectId.orElse(null))
137138
.map(ResponseView::success));
138139
}
139140
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/GidService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
importorg.springframework.stereotype.Component;
2121
importreactor.core.publisher.Mono;
2222

23+
importjava.util.Optional;
24+
2325
@Component
2426
publicclassGidService {
2527
@Autowired
@@ -72,11 +74,11 @@ public Mono<String> convertLibraryQueryIdToObjectId(String id) {
7274
returnMono.just(id);
7375
}
7476

75-
publicMono<String>convertFolderIdToObjectId(Stringid) {
77+
publicMono<Optional<String>>convertFolderIdToObjectId(Stringid) {
7678
if(FieldName.isGID(id)) {
77-
returnfolderRepository.findByGid(id).next().mapNotNull(HasIdAndAuditing::getId);
79+
returnfolderRepository.findByGid(id).next().mapNotNull(HasIdAndAuditing::getId).map(Optional::ofNullable).switchIfEmpty(Mono.just(Optional.empty()));
7880
}
79-
returnMono.just(id);
81+
returnMono.just(Optional.ofNullable(id));
8082
}
8183

8284
publicMono<String>convertBundleIdToObjectId(Stringid) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp