From e80ffb7f9be04226d2a6ea9566612b06df85e580 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 13 十一月 2024 17:58:14 +0800
Subject: [PATCH] 参数修改
---
app/api/role.py | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/app/api/role.py b/app/api/role.py
index dfcc7bb..a4674c3 100644
--- a/app/api/role.py
+++ b/app/api/role.py
@@ -11,9 +11,10 @@
role_router = APIRouter()
@role_router.get("/list", response_model=Response)
-async def user_group_list(paras: PageParameter, current_user: UserModel = Depends(get_current_user),
+async def user_group_list(current, pageSize, keyword="", current_user: UserModel = Depends(get_current_user),
db=Depends(get_db)):
- return Response(code=200, msg="", data=await role_list(db, paras.page_size, paras.page_index, paras.keyword))
+
+ return Response(code=200, msg="", data=await role_list(db, pageSize, current, keyword, current_user.permission, current_user.id))
@role_router.post("/add_role", response_model=Response)
@@ -23,9 +24,9 @@
db_role = db.query(RoleModel).filter(RoleModel.name == role.roleName).first()
if db_role:
return Response(code=200, msg="role already created")
- is_create = await create_role(db, role.roleName, role.remark, current_user.id)
+ is_create = await create_role(db, role.roleName, role.remark, role.roleKey, role.dataScope,current_user.id)
if not is_create:
- return Response(code=200, msg="role create failure", data={})
+ return Response(code=500, msg="role create failure", data={})
return Response(code=200, msg="role create successfully", data={"roleName": role.roleName})
@role_router.delete("/delete_role/{role_id}", response_model=Response)
@@ -35,7 +36,7 @@
return Response(code=200, msg="role does not exist")
is_edit = await delete_role_data(db, role_id)
if not is_edit:
- return Response(code=200, msg="role delete failure", data={})
+ return Response(code=500, msg="role delete failure", data={})
return Response(code=200, msg="role delete successfully", data={})
@@ -48,19 +49,22 @@
return Response(code=200, msg="role does not exist")
is_edit = await edit_role_status(db, role.status,role.role_id)
if not is_edit:
- return Response(code=200, msg="role status edit failure", data={})
+ return Response(code=500, msg="role status edit failure", data={})
return Response(code=200, msg="role status edit successfully", data={})
@role_router.put("/edit_role", response_model=Response)
async def edit_role_data(role: RoleEdit, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- db_role = db.query(RoleModel).filter(RoleModel.id == role.role_id).first()
- if not db_role:
- return Response(code=200, msg="role does not exist")
- if role.roleName:
+ if role.editType == 1:
+ if not role.roleName:
+ return Response(code=400, msg="The roleName cannot be empty!")
+ db_role = db.query(RoleModel).filter(RoleModel.id == role.role_id).first()
+ if not db_role:
+ return Response(code=200, msg="role does not exist")
+
db_role = db.query(RoleModel).filter(RoleModel.name == role.roleName).first()
- if db_role:
+ if db_role and db_role.id != role.role_id:
return Response(code=200, msg="role already created")
- is_edit = await edit_role_resource(db, role.role_id,role.roleName, role.remark, role.resources)
+ is_edit = await edit_role_resource(db, role.role_id,role.roleName, role.remark, role.roleKey, role.dataScope, role.resources, role.editType)
if not is_edit:
- return Response(code=200, msg="role edit failure", data={})
+ return Response(code=500, msg="role edit failure", data={})
return Response(code=200, msg="role edit successfully", data={})
\ No newline at end of file
--
Gitblit v1.8.0