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

fix: knowledge list (#3349)

Browse Source
This commit is contained in:
shaohuzhang1 2025-06-23 17:08:13 +08:00 committed by GitHub
parent 516c8ea9d2
commit 4a722575df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,9 +142,6 @@ class KnowledgeSerializer(serializers.Serializer):
if "name" in self.data and self.data.get('name') is not None: if "name" in self.data and self.data.get('name') is not None:
query_set = query_set.filter(**{'temp.name__icontains': self.data.get("name")}) query_set = query_set.filter(**{'temp.name__icontains': self.data.get("name")})
folder_query_set = folder_query_set.filter(**{'name__icontains': self.data.get("name")}) folder_query_set = folder_query_set.filter(**{'name__icontains': self.data.get("name")})
if "user_id" in self.data and self.data.get('user_id') is not None:
query_set = query_set.filter(**{'temp.user_id': self.data.get("user_id")})
folder_query_set = folder_query_set.filter(**{'user_id': self.data.get("user_id")})
if "workspace_id" in self.data and self.data.get('workspace_id') is not None: if "workspace_id" in self.data and self.data.get('workspace_id') is not None:
query_set = query_set.filter(**{'temp.workspace_id': self.data.get("workspace_id")}) query_set = query_set.filter(**{'temp.workspace_id': self.data.get("workspace_id")})
folder_query_set = folder_query_set.filter(**{'workspace_id': self.data.get("workspace_id")}) folder_query_set = folder_query_set.filter(**{'workspace_id': self.data.get("workspace_id")})
@ -161,7 +158,7 @@ class KnowledgeSerializer(serializers.Serializer):
})).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
workspace_user_role_mapping_model = DatabaseModelManage.get_model('workspace_user_role_mapping') workspace_user_role_mapping_model = DatabaseModelManage.get_model('workspace_user_role_mapping')
if workspace_manage and is_x_pack_ee: if not workspace_manage and is_x_pack_ee:
query_set_dict['user_query_set'] = QuerySet(workspace_user_role_mapping_model).filter( query_set_dict['user_query_set'] = QuerySet(workspace_user_role_mapping_model).filter(
user_id=self.data.get("user_id"), workspace_id=workspace_id) user_id=self.data.get("user_id"), workspace_id=workspace_id)
return query_set_dict return query_set_dict