From 8e3a2d2cc78dba7e5c9a7145ceae65658b32da66 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 20 一月 2025 11:01:45 +0800
Subject: [PATCH] 合并历史记录修改
---
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 7c40272..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(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == user_id))
+ 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