From c7d5be908e24ee7677140c1cf983836f2e413cf0 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 18:26:20 +0800
Subject: [PATCH] 会话菜单增加
---
app/service/knowledge.py | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index 043db0f..91022c3 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -3,7 +3,7 @@
from Log import logger
-async def get_knowledge_list(db, user_id, page_size, page_index):
+async def get_knowledge_list(db, user_id, keyword, page_size, page_index):
user = db.query(UserModel).filter(UserModel.id == user_id).first()
if user is None:
return {"rows": []}
@@ -13,6 +13,7 @@
group_list = [i.id for i in user.groups]
query = db.query(KnowledgeModel)
query = query.filter(KnowledgeModel.tenant_id == user_id)
+
query = query.union(
db.query(KnowledgeModel).join(
group_knowledge_table,
@@ -21,6 +22,9 @@
group_knowledge_table.c.group_id.in_(group_list)
)
)
- if page_size:
- query = query.limit(page_size).offset((page_index - 1) * page_size)
- return {"rows": [kld.to_json() for kld in query.all()]}
+ if keyword:
+ query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword)))
+ total = query.count()
+ if page_size:
+ query = query.limit(page_size).offset((page_index - 1) * page_size)
+ return {"total": total, "rows": [kld.to_json() for kld in query.all()]}
--
Gitblit v1.8.0