|
@@ -21,32 +21,39 @@ async def rolecreate(
|
|
|
body = Depends(remove_xss_json)
|
|
|
):
|
|
|
try:
|
|
|
-
|
|
|
-
|
|
|
- role.role_key = body['roleKey']
|
|
|
- role.role_name = body['roleName']
|
|
|
- role.role_sort = body['roleSort']
|
|
|
- role.status = body['status']
|
|
|
- role.remark = body['remark']
|
|
|
menuCheckStrictly = body['menuCheckStrictly']
|
|
|
if menuCheckStrictly:
|
|
|
- role.menu_check_strictly = 1
|
|
|
+ menu_check_strictly = 1
|
|
|
else:
|
|
|
- role.menu_check_strictly = 0
|
|
|
+ menu_check_strictly = 0
|
|
|
|
|
|
- menuIds = body['menuIds']
|
|
|
+ role_key = body['roleKey']
|
|
|
+ role_name = body['roleName']
|
|
|
+ role_sort = body['roleSort']
|
|
|
+ status = body['status']
|
|
|
+ remark = body['remark']
|
|
|
|
|
|
|
|
|
- # 清除当前用户的所有角色关联
|
|
|
- db.query(SysRoleMenu).filter(SysRoleMenu.role_id == roleId).delete()
|
|
|
+ menuIds = body['menuIds']
|
|
|
+ new_role = SysRole(
|
|
|
+ menu_check_strictly=menu_check_strictly,
|
|
|
+ role_key=role_key,
|
|
|
+ role_name=role_name,
|
|
|
+ role_sort=role_sort,
|
|
|
+ status=status,
|
|
|
+ remark=remark
|
|
|
+ )
|
|
|
+ db.add(new_role)
|
|
|
+ db.commit()
|
|
|
+ db.refresh(new_role)
|
|
|
|
|
|
# 创建新的用户角色关联
|
|
|
- new_role_menus = [SysRoleMenu(role_id=roleId, menu_id=menu_id) for menu_id in menuIds]
|
|
|
+ new_role_menus = [SysRoleMenu(role_id=new_role.role_id, menu_id=menu_id) for menu_id in menuIds]
|
|
|
db.add_all(new_role_menus)
|
|
|
|
|
|
|
|
|
db.commit()
|
|
|
- return {"code": 200, "msg": "更新成功", "data": None}
|
|
|
+ return {"code": 200, "msg": "创建成功", "data": None}
|
|
|
|
|
|
|
|
|
except Exception as e:
|