From e6f0a5e0eaef45504ec3aa0942bf70a1c1912e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Sun, 3 Dec 2023 23:07:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修复角色相关代码中存在is_admin引起的错误 --- .../dvadmin/system/views/role_menu_button_permission.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/dvadmin/system/views/role_menu_button_permission.py b/backend/dvadmin/system/views/role_menu_button_permission.py index a8865ca..603861c 100644 --- a/backend/dvadmin/system/views/role_menu_button_permission.py +++ b/backend/dvadmin/system/views/role_menu_button_permission.py @@ -213,8 +213,7 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet): if params := request.query_params: if menu_id := params.get('menu', None): is_superuser = request.user.is_superuser - is_admin = request.user.role.values_list('admin', flat=True) - if is_superuser or True in is_admin: + if is_superuser: queryset = MenuButton.objects.filter(menu=menu_id).values('id', 'name') else: role_list = request.user.role.values_list('id', flat=True) @@ -324,8 +323,7 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet): """ params = request.query_params is_superuser = request.user.is_superuser - is_admin = request.user.role.values_list('admin', flat=True) - if is_superuser or True in is_admin: + if is_superuser: queryset = Dept.objects.values('id', 'name', 'parent') else: if not params: @@ -353,8 +351,7 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet): if menu_id is None: return ErrorResponse(msg="未获取到参数") is_superuser = request.user.is_superuser - is_admin = request.user.role.values_list('admin', flat=True) - if is_superuser or True in is_admin: + if is_superuser: queryset = RoleMenuButtonPermission.objects.filter(menu_button__menu=menu_id).values( 'id', 'data_range',