admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复BUG:

Browse Source 
1.修复角色相关代码中存在is_admin引起的错误
This commit is contained in:
猿小天
2023-12-03 23:07:18 +08:00
parent cbebd8305c
commit e6f0a5e0ea
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/dvadmin/system/views/role_menu_button_permission.py
View File

@@ -213,8 +213,7 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
if params := request.query_params: if params := request.query_params:
if menu_id := params.get('menu', None): if menu_id := params.get('menu', None):
is_superuser = request.user.is_superuser is_superuser = request.user.is_superuser
is_admin = request.user.role.values_list('admin', flat=True) if is_superuser:
if is_superuser or True in is_admin:
queryset = MenuButton.objects.filter(menu=menu_id).values('id', 'name') queryset = MenuButton.objects.filter(menu=menu_id).values('id', 'name')
else: else:
role_list = request.user.role.values_list('id', flat=True) role_list = request.user.role.values_list('id', flat=True)
@@ -324,8 +323,7 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
""" """
params = request.query_params params = request.query_params
is_superuser = request.user.is_superuser is_superuser = request.user.is_superuser
is_admin = request.user.role.values_list('admin', flat=True) if is_superuser:
if is_superuser or True in is_admin:
queryset = Dept.objects.values('id', 'name', 'parent') queryset = Dept.objects.values('id', 'name', 'parent')
else: else:
if not params: if not params:
@@ -353,8 +351,7 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
if menu_id is None: if menu_id is None:
return ErrorResponse(msg="未获取到参数") return ErrorResponse(msg="未获取到参数")
is_superuser = request.user.is_superuser is_superuser = request.user.is_superuser
is_admin = request.user.role.values_list('admin', flat=True) if is_superuser:
if is_superuser or True in is_admin:
queryset = RoleMenuButtonPermission.objects.filter(menu_button__menu=menu_id).values( queryset = RoleMenuButtonPermission.objects.filter(menu_button__menu=menu_id).values(
'id', 'id',
'data_range', 'data_range',