From 247038b7ee75997c1a9ae1a7472e5eb5023bc9e8 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期三, 19 二月 2025 14:37:09 +0800 Subject: [PATCH] commit --- app/service/knowledge.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/service/knowledge.py b/app/service/knowledge.py index 32e5762..e175f87 100644 --- a/app/service/knowledge.py +++ b/app/service/knowledge.py @@ -15,9 +15,11 @@ query = db.query(KnowledgeModel).filter(KnowledgeModel.knowledge_type==knowledge) if user.permission != "admin": klg_list = [j.id for i in user.groups for j in i.knowledges] - query = query.filter(or_(KnowledgeModel.tenant_id == user_id, KnowledgeModel.id.in_(klg_list))) + query = query.filter(or_(KnowledgeModel.id.in_(klg_list), KnowledgeModel.tenant_id == str(user_id))) + if location: - query = query.filter(KnowledgeModel.permission == "team") + query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == str(user_id))) + if keyword: query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword))) total = query.count() -- Gitblit v1.8.0