@@ -234,7 +234,7 @@ public Mono<Void> upsertLastViewTime(@Nullable String folderId) {
234234 */
235235 @ Override
236236 public Flux <?> getElements (@ Nullable String folderId , @ Nullable ApplicationType applicationType , @ Nullable String name , @ Nullable String category ) {
237- return buildApplicationInfoViewTree (applicationType , name , category )
237+ return buildApplicationInfoViewTree (applicationType , name , category , folderId )
238238 .flatMap (tree -> {
239239 FolderNode <ApplicationInfoView , FolderInfoView > folderNode = tree .get (folderId );
240240 if (folderNode == null ) {
@@ -278,7 +278,7 @@ private Mono<Tree<Object, Folder>> buildFolderTree(String orgId) {
278278 .map (folders -> new Tree <>(folders , Folder ::getId , Folder ::getParentFolderId , Collections .emptyList (), null , null ));
279279 }
280280
281- private Mono <Tree <ApplicationInfoView , FolderInfoView >> buildApplicationInfoViewTree (@ Nullable ApplicationType applicationType , @ Nullable String name , @ Nullable String category ) {
281+ private Mono <Tree <ApplicationInfoView , FolderInfoView >> buildApplicationInfoViewTree (@ Nullable ApplicationType applicationType , @ Nullable String name , @ Nullable String category , @ Nullable String folderId ) {
282282
283283 Mono <OrgMember > orgMemberMono = sessionUserService .getVisitorOrgMemberCache ()
284284 .cache ();
@@ -296,7 +296,8 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
296296 Flux <Folder > folderFlux = orgMemberMono .flatMapMany (orgMember -> folderService .findByOrganizationId (orgMember .getOrgId ()))
297297 .filter (folder -> name == null || StringUtils .containsIgnoreCase (folder .getName (), name )
298298 || StringUtils .containsIgnoreCase (folder .getType (), name )
299- || StringUtils .containsIgnoreCase (folder .getDescription (), name ))
299+ || StringUtils .containsIgnoreCase (folder .getDescription (), name )
300+ || StringUtils .containsIgnoreCase (folder .getId (), folderId ))
300301 .cache ();
301302
302303 Mono <Map <String , Instant >> folderId2LastViewTimeMapMono = orgMemberMono
0 commit comments