From ad5c8122d3f332f5192774f4b5e3b77440230343 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Tue, 1 Jul 2025 11:58:44 +0800 Subject: [PATCH] refactor: remove unnecessary condition for workspace management in knowledge.py and update SQL query in list_knowledge_user.sql --- apps/knowledge/serializers/knowledge.py | 2 +- apps/knowledge/sql/list_knowledge_user.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py index cbb8608b..8e721506 100644 --- a/apps/knowledge/serializers/knowledge.py +++ b/apps/knowledge/serializers/knowledge.py @@ -160,7 +160,7 @@ class KnowledgeSerializer(serializers.Serializer): 'knowledge.workspace_id': models.CharField(), })).filter(**{'knowledge.workspace_id': workspace_id}) query_set_dict['folder_query_set'] = folder_query_set - if not workspace_manage and is_x_pack_ee: + if not workspace_manage: query_set_dict['workspace_user_resource_permission_query_set'] = QuerySet( WorkspaceUserResourcePermission).filter( auth_target_type="KNOWLEDGE", diff --git a/apps/knowledge/sql/list_knowledge_user.sql b/apps/knowledge/sql/list_knowledge_user.sql index 6525f067..cb786d8f 100644 --- a/apps/knowledge/sql/list_knowledge_user.sql +++ b/apps/knowledge/sql/list_knowledge_user.sql @@ -22,7 +22,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, FROM knowledge knowledge ${knowledge_custom_sql} AND id in (select target from workspace_user_resource_permission - where auth_target_type = 'KNOWLEDGE' + ${workspace_user_resource_permission_query_set} and 'VIEW' = any (permission_list))) temp_knowledge LEFT JOIN (SELECT "count"("id") AS document_count, "sum"("char_length") "char_length", knowledge_id FROM "document"