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 | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index c9c89b4..b927feb 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -1,23 +1,21 @@
-from app.models import KnowledgeModel, GroupModel
+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, role, user_id):
- if role == "admin":
- kld_list = db.query(KnowledgeModel).all()
- else:
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
-
- group_list = [i.id for i in user.groups]
-
- kld_list = db.query(KnowledgeModel).filter(KnowledgeModel.tenant_id == user_id).all()
- kld_set = set([i.id for i in kld_list])
- for group in db.query(GroupModel).filter(GroupModel.id.in_(group_list)).all():
- for k in group.knowledges:
- if k.id not in kld_set:
- kld_list.append(k)
- kld_set.add(k.id)
-
- return {"rows": [kld.to_json() for kld in kld_list]}
-
+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": []}
+ 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