From 23a0c7aa0f35206fe7175731d9706023d449e67f Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 18 Apr 2025 14:31:16 +0800
Subject: [PATCH] fix: improve module tree query to use Q object for filtering
 by workspace_id

---
 apps/modules/api/module.py         | 9 ++++++++-
 apps/modules/serializers/module.py | 8 ++++++--
 apps/modules/views/module.py       | 2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/modules/api/module.py b/apps/modules/api/module.py
index 73a7e513d0e..a910e35bfee 100644
--- a/apps/modules/api/module.py
+++ b/apps/modules/api/module.py
@@ -105,5 +105,12 @@ def get_parameters():
                 enum=["APPLICATION", "KNOWLEDGE", "TOOL"],
                 location='path',
                 required=True,
-            )
+            ),
+            OpenApiParameter(
+                name="name",
+                description="名称",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
         ]
diff --git a/apps/modules/serializers/module.py b/apps/modules/serializers/module.py
index 85b8e9c5f38..3a6e90fd1b5 100644
--- a/apps/modules/serializers/module.py
+++ b/apps/modules/serializers/module.py
@@ -95,9 +95,13 @@ class ModuleTreeSerializer(serializers.Serializer):
     workspace_id = serializers.CharField(required=True, allow_null=True, allow_blank=True, label=_('workspace id'))
     source = serializers.CharField(required=True, label=_('source'))
 
-    def get_module_tree(self):
+    def get_module_tree(self, name=None):
         self.is_valid(raise_exception=True)
         Module = get_module_type(self.data.get('source'))
-        nodes = Module.objects.filter(Q(workspace_id=self.data.get('workspace_id'))).get_cached_trees()
+        if name is not None:
+            nodes = Module.objects.filter(Q(workspace_id=self.data.get('workspace_id')) &
+                                          Q(name__contains=name)).get_cached_trees()
+        else:
+            nodes = Module.objects.filter(Q(workspace_id=self.data.get('workspace_id'))).get_cached_trees()
         serializer = ToolModuleTreeSerializer(nodes, many=True)
         return serializer.data  # 这是可序列化的字典
diff --git a/apps/modules/views/module.py b/apps/modules/views/module.py
index ea883b9ab7b..b0eed2fb512 100644
--- a/apps/modules/views/module.py
+++ b/apps/modules/views/module.py
@@ -88,4 +88,4 @@ class ModuleTreeView(APIView):
     def get(self, request: Request, workspace_id: str, source: str):
         return result.success(ModuleTreeSerializer(
             data={'workspace_id': workspace_id, 'source': source}
-        ).get_module_tree())
+        ).get_module_tree(request.query_params.get('name')))