|
8 | 8 | importorg.lowcoder.api.util.GidService; |
9 | 9 | importorg.lowcoder.domain.application.model.ApplicationType; |
10 | 10 | importorg.lowcoder.domain.folder.model.Folder; |
| 11 | +importorg.lowcoder.domain.folder.model.FolderElement; |
11 | 12 | importorg.lowcoder.domain.folder.service.FolderElementRelationService; |
12 | 13 | importorg.lowcoder.domain.folder.service.FolderService; |
13 | 14 | importorg.lowcoder.domain.permission.model.ResourceRole; |
@@ -92,7 +93,7 @@ public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", require |
92 | 93 | @Override |
93 | 94 | publicMono<ResponseView<Void>>move(@PathVariable("id")StringapplicationLikeId, |
94 | 95 | @RequestParam(value ="targetFolderId",required =false)StringtargetFolderId) { |
95 | | -returnfolderElementRelationService.getByElementIds(List.of(applicationLikeId)).next().flatMap(folderElement -> |
| 96 | +returnfolderElementRelationService.getByElementIds(List.of(applicationLikeId)).next().defaultIfEmpty(newFolderElement(null,null)).flatMap(folderElement -> |
96 | 97 | gidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId -> |
97 | 98 | folderApiService.move(applicationLikeId,objectId.orElse(null)) |
98 | 99 | .then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId,folderElement.folderId(),objectId.orElse(null),APPLICATION_MOVE)) |
|