From 80b3be46fd22da9ca0d29da4719ca3d4e2a198dc Mon Sep 17 00:00:00 2001 From: CaptainB Date: Thu, 19 Jun 2025 19:39:16 +0800 Subject: [PATCH] fix: add template_id to tool and tool_folder queries in list_tool.sql --- apps/tools/serializers/tool.py | 7 ++++++- apps/tools/sql/list_tool.sql | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/tools/serializers/tool.py b/apps/tools/serializers/tool.py index d36e057cf..b15a4402e 100644 --- a/apps/tools/serializers/tool.py +++ b/apps/tools/serializers/tool.py @@ -581,5 +581,10 @@ class ToolTreeSerializer(serializers.Serializer): return native_page_search( current_page, page_size, self.get_query_set(), - get_file_content(os.path.join(PROJECT_DIR, "apps", "tools", 'sql', 'list_tool.sql')) + get_file_content(os.path.join(PROJECT_DIR, "apps", "tools", 'sql', 'list_tool.sql')), + post_records_handler=lambda record: { + **record, + 'input_field_list': json.loads(record.get('input_field_list', '[]')), + 'init_field_list': json.loads(record.get('init_field_list', '[]')), + }, ) diff --git a/apps/tools/sql/list_tool.sql b/apps/tools/sql/list_tool.sql index 19cbd6ec5..0272816b5 100644 --- a/apps/tools/sql/list_tool.sql +++ b/apps/tools/sql/list_tool.sql @@ -13,6 +13,8 @@ from (select tool."id"::text, tool."template_id"::text, tool."create_time", tool."update_time", + tool.init_field_list, + tool.input_field_list, tool."is_active" from tool left join "user" on "user".id = user_id ${tool_scope_query_set} @@ -31,6 +33,8 @@ from (select tool."id"::text, '' as "template_id", tool_folder."create_time", tool_folder."update_time", + '[]'::jsonb as init_field_list, + '[]'::jsonb as input_field_list, 'true' as "is_active" from tool_folder left join "user" on "user".id = user_id ${folder_query_set}) temp