From 0650b889a36d9b9fd42415b9b9819676f839ae9b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 08 四月 2025 09:54:09 +0800
Subject: [PATCH] 首页会话-模型修改
---
app/api/role.py | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/app/api/role.py b/app/api/role.py
index a4674c3..5ddeef9 100644
--- a/app/api/role.py
+++ b/app/api/role.py
@@ -11,7 +11,7 @@
role_router = APIRouter()
@role_router.get("/list", response_model=Response)
-async def user_group_list(current, pageSize, keyword="", current_user: UserModel = Depends(get_current_user),
+async def user_group_list(current:int, pageSize:int, keyword="", current_user: UserModel = Depends(get_current_user),
db=Depends(get_db)):
return Response(code=200, msg="", data=await role_list(db, pageSize, current, keyword, current_user.permission, current_user.id))
@@ -29,12 +29,14 @@
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)
-async def delete_group(role_id: str, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- db_role = db.query(RoleModel).filter(RoleModel.id == role_id).first()
+@role_router.delete("/delete_role/{roleId}", response_model=Response)
+async def delete_group(roleId: str, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ db_role = db.query(RoleModel).filter(RoleModel.id == roleId).first()
if not db_role:
return Response(code=200, msg="role does not exist")
- is_edit = await delete_role_data(db, role_id)
+ if db_role.role_type ==2:
+ return Response(code=400, msg="榛樿瑙掕壊涓嶅厑璁稿垹闄�!")
+ is_edit = await delete_role_data(db, roleId)
if not is_edit:
return Response(code=500, msg="role delete failure", data={})
return Response(code=200, msg="role delete successfully", data={})
@@ -44,10 +46,10 @@
async def edit_group_status(role: RoleStatus, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
if role.status not in ["0", "1"]:
return Response(code=400, msg="The status cannot be {}!".format(role.status))
- db_role = db.query(RoleModel).filter(RoleModel.id == role.role_id).first()
+ db_role = db.query(RoleModel).filter(RoleModel.id == role.roleId).first()
if not db_role:
return Response(code=200, msg="role does not exist")
- is_edit = await edit_role_status(db, role.status,role.role_id)
+ is_edit = await edit_role_status(db, role.status,role.roleId)
if not is_edit:
return Response(code=500, msg="role status edit failure", data={})
return Response(code=200, msg="role status edit successfully", data={})
@@ -57,14 +59,14 @@
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()
+ db_role = db.query(RoleModel).filter(RoleModel.id == role.roleId).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 and db_role.id != role.role_id:
+ if db_role and db_role.id != role.roleId:
return Response(code=200, msg="role already created")
- is_edit = await edit_role_resource(db, role.role_id,role.roleName, role.remark, role.roleKey, role.dataScope, role.resources, role.editType)
+ is_edit = await edit_role_resource(db, role.roleId,role.roleName, role.remark, role.roleKey, role.dataScope, role.resources, role.editType, role.depts)
if not is_edit:
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