From d1f7a4ecdb84acaf6a7d986a13a642a337dd31e5 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 14 十一月 2024 18:17:25 +0800
Subject: [PATCH] 配置组权限
---
app/api/knowledge.py | 6 ++++++
app/service/group.py | 2 +-
app/service/user.py | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/api/knowledge.py b/app/api/knowledge.py
index be70bbf..62762cb 100644
--- a/app/api/knowledge.py
+++ b/app/api/knowledge.py
@@ -12,4 +12,10 @@
@knowledge_router.get("/list", response_model=Response)
async def knowledge_list(role:str="", current_user: UserModel = Depends(get_current_user),
db=Depends(get_db)):
+ return Response(code=200, msg="", data = await get_knowledge_list(db, role, current_user.id))
+
+
+@knowledge_router.get("/list", response_model=Response)
+async def knowledge_list(role:str="", current_user: UserModel = Depends(get_current_user),
+ db=Depends(get_db)):
return Response(code=200, msg="", data = await get_knowledge_list(db, role, current_user.id))
\ No newline at end of file
diff --git a/app/service/group.py b/app/service/group.py
index d7845fa..a1598ac 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -60,7 +60,7 @@
in_group_user = []
user_list = [u.id for i in
db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).all() for u in i.users]
- for u in db.query(UserModel.id, UserModel.username).order_by(UserModel.id.desc()).all():
+ for u in db.query(UserModel.id, UserModel.username).filter(UserModel.permission!="admin").order_by(UserModel.id.desc()).all():
if u.id in user_list:
in_group_user.append({"user_id": u.id, "user_name": u.username})
else:
diff --git a/app/service/user.py b/app/service/user.py
index e2d8467..c11a386 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -33,7 +33,7 @@
async def delete_user_data(db, user_id: str):
try:
- db.query(UserModel).filter(UserModel.id == user_id).delete()
+ db.query(UserModel).filter(UserModel.id == user_id, UserModel.permission!="admin").delete()
db.commit()
except Exception as e:
logger.error(e)
--
Gitblit v1.8.0