From 814fdd158e2408286f0aa32fbf6f3f8c6e926cbc Mon Sep 17 00:00:00 2001
From: Thomasr <techninjas514@begintrust.com>
Date: Fri, 13 Dec 2024 10:39:06 -0500
Subject: [PATCH] Fix issue in searching app inside folder.

---
 .../java/org/lowcoder/api/home/FolderApiServiceImpl.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
index 0d93a2e3b..ff8c6dce0 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
@@ -234,7 +234,7 @@ public Mono<Void> upsertLastViewTime(@Nullable String folderId) {
      */
     @Override
     public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name, @Nullable String category) {
-        return buildApplicationInfoViewTree(applicationType, name, category)
+        return buildApplicationInfoViewTree(applicationType, name, category, folderId)
                 .flatMap(tree -> {
                     FolderNode<ApplicationInfoView, FolderInfoView> folderNode = tree.get(folderId);
                     if (folderNode == null) {
@@ -278,7 +278,7 @@ private Mono<Tree<Object, Folder>> buildFolderTree(String orgId) {
                 .map(folders -> new Tree<>(folders, Folder::getId, Folder::getParentFolderId, Collections.emptyList(), null, null));
     }
 
-    private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoViewTree(@Nullable ApplicationType applicationType, @Nullable String name, @Nullable String category) {
+    private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoViewTree(@Nullable ApplicationType applicationType, @Nullable String name, @Nullable String category, @Nullable String folderId) {
 
         Mono<OrgMember> orgMemberMono = sessionUserService.getVisitorOrgMemberCache()
                 .cache();
@@ -296,7 +296,8 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
         Flux<Folder> folderFlux = orgMemberMono.flatMapMany(orgMember -> folderService.findByOrganizationId(orgMember.getOrgId()))
                 .filter(folder -> name == null || StringUtils.containsIgnoreCase(folder.getName(), name)
                         || StringUtils.containsIgnoreCase(folder.getType(), name)
-                        || StringUtils.containsIgnoreCase(folder.getDescription(), name))
+                        || StringUtils.containsIgnoreCase(folder.getDescription(), name)
+                        || StringUtils.containsIgnoreCase(folder.getId(), folderId))
                 .cache();
 
         Mono<Map<String, Instant>> folderId2LastViewTimeMapMono = orgMemberMono