From 90557ea03973c1b71b1d15f2f6eba84904969673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Sat, 10 Jun 2023 22:39:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E9=83=A8=E9=97=A8=E6=87=92=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复部门懒加载报data_range错误 --- backend/dvadmin/system/views/dept.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index e362bd0..64d62ad 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -9,7 +9,7 @@ from rest_framework import serializers from rest_framework.decorators import action from rest_framework.permissions import IsAuthenticated -from dvadmin.system.models import Dept +from dvadmin.system.models import Dept, RoleMenuButtonPermission from dvadmin.utils.json_response import DetailResponse, SuccessResponse from dvadmin.utils.permission import AnonymousUserPermission from dvadmin.utils.serializers import CustomModelSerializer @@ -130,7 +130,8 @@ class DeptViewSet(CustomModelViewSet): if is_superuser: queryset = Dept.objects.values('id', 'name', 'parent') else: - data_range = request.user.role.values_list('data_range', flat=True) + role_ids = request.user.role.values_list('id',flat=True) + data_range = RoleMenuButtonPermission.objects.filter(role__in=role_ids).values_list('data_range', flat=True) user_dept_id = request.user.dept.id dept_list = [user_dept_id] data_range_list = list(set(data_range))