From f4ff5d87afdfe4f6fe6ac18cda6cfadfbf557fa1 Mon Sep 17 00:00:00 2001 From: H0nGzA1 <2505811377@qq.com> Date: Fri, 28 Jul 2023 18:11:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=AD=90=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/menu.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py index 3f4e8f6..63077e5 100644 --- a/backend/dvadmin/system/views/menu.py +++ b/backend/dvadmin/system/views/menu.py @@ -117,10 +117,7 @@ class MenuViewSet(CustomModelViewSet): else: role_list = user.role.values_list('id', flat=True) menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_id', flat=True) - print("role_list", role_list) - print("menu_list", menu_list) queryset = Menu.objects.filter(id__in=menu_list) - print(queryset) serializer = WebRouterSerializer(queryset, many=True, request=request) data = serializer.data return SuccessResponse(data=data, total=len(data), msg="获取成功") @@ -146,7 +143,7 @@ class MenuViewSet(CustomModelViewSet): menu = Menu.objects.get(id=menu_id) except Menu.DoesNotExist: return ErrorResponse(msg="菜单不存在") - previous_menu = Menu.objects.filter(sort__lt=menu.sort).order_by('-sort').first() + previous_menu = Menu.objects.filter(sort__lt=menu.sort, parent=menu.parent).order_by('-sort').first() if previous_menu: previous_menu.sort, menu.sort = menu.sort, previous_menu.sort previous_menu.save() @@ -162,7 +159,7 @@ class MenuViewSet(CustomModelViewSet): menu = Menu.objects.get(id=menu_id) except Menu.DoesNotExist: return ErrorResponse(msg="菜单不存在") - next_menu = Menu.objects.filter(sort__gt=menu.sort).order_by('sort').first() + next_menu = Menu.objects.filter(sort__gt=menu.sort, parent=menu.parent).order_by('sort').first() if next_menu: next_menu.sort, menu.sort = menu.sort, next_menu.sort next_menu.save()