zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove unnecessary condition for workspace management in knowledge.py and update SQL query in list_knowledge_user.sql

Browse Source
This commit is contained in:
CaptainB 2025-07-01 11:58:44 +08:00
parent e724ffbebd
commit ad5c8122d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/knowledge/serializers/knowledge.py
View File

@ -160,7 +160,7 @@ class KnowledgeSerializer(serializers.Serializer):
'knowledge.workspace_id': models.CharField(), 'knowledge.workspace_id': models.CharField(),
})).filter(**{'knowledge.workspace_id': workspace_id}) })).filter(**{'knowledge.workspace_id': workspace_id})
query_set_dict['folder_query_set'] = folder_query_set 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( query_set_dict['workspace_user_resource_permission_query_set'] = QuerySet(
WorkspaceUserResourcePermission).filter( WorkspaceUserResourcePermission).filter(
auth_target_type="KNOWLEDGE", auth_target_type="KNOWLEDGE",

2
apps/knowledge/sql/list_knowledge_user.sql
View File

@ -22,7 +22,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
FROM knowledge knowledge ${knowledge_custom_sql} FROM knowledge knowledge ${knowledge_custom_sql}
AND id in (select target AND id in (select target
from workspace_user_resource_permission from workspace_user_resource_permission
where auth_target_type = 'KNOWLEDGE' ${workspace_user_resource_permission_query_set}
and 'VIEW' = any (permission_list))) temp_knowledge and 'VIEW' = any (permission_list))) temp_knowledge
LEFT JOIN (SELECT "count"("id") AS document_count, "sum"("char_length") "char_length", knowledge_id LEFT JOIN (SELECT "count"("id") AS document_count, "sum"("char_length") "char_length", knowledge_id
FROM "document" FROM "document"