From a791022ff1311e1fb76930c398d6ff91036d0456 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 11 十二月 2024 17:57:52 +0800
Subject: [PATCH] 新增加标签功能
---
app/service/knowledge.py | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index 043db0f..b927feb 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -1,26 +1,21 @@
+from sqlalchemy import or_
+
from app.models import KnowledgeModel, group_knowledge_table
from app.models.user_model import UserModel
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": []}
- if user.permission == "admin":
- query = db.query(KnowledgeModel)
- else:
- 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,
- KnowledgeModel.id == group_knowledge_table.c.knowledge_id
- ).filter(
- 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()]}
+ query = db.query(KnowledgeModel)
+ 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)))
+ 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