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

fix: 移动菜单子级问题

Browse Source
This commit is contained in:
H0nGzA1
2023-07-28 18:11:57 +08:00
committed by 李强
parent ceac44813f
commit f4ff5d87af
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/dvadmin/system/views/menu.py
View File

@@ -117,10 +117,7 @@ class MenuViewSet(CustomModelViewSet):
else: else:
role_list = user.role.values_list('id', flat=True) role_list = user.role.values_list('id', flat=True)
menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_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) queryset = Menu.objects.filter(id__in=menu_list)
print(queryset)
serializer = WebRouterSerializer(queryset, many=True, request=request) serializer = WebRouterSerializer(queryset, many=True, request=request)
data = serializer.data data = serializer.data
return SuccessResponse(data=data, total=len(data), msg="获取成功") return SuccessResponse(data=data, total=len(data), msg="获取成功")
@@ -146,7 +143,7 @@ class MenuViewSet(CustomModelViewSet):
menu = Menu.objects.get(id=menu_id) menu = Menu.objects.get(id=menu_id)
except Menu.DoesNotExist: except Menu.DoesNotExist:
return ErrorResponse(msg="菜单不存在") 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: if previous_menu:
previous_menu.sort, menu.sort = menu.sort, previous_menu.sort previous_menu.sort, menu.sort = menu.sort, previous_menu.sort
previous_menu.save() previous_menu.save()
@@ -162,7 +159,7 @@ class MenuViewSet(CustomModelViewSet):
menu = Menu.objects.get(id=menu_id) menu = Menu.objects.get(id=menu_id)
except Menu.DoesNotExist: except Menu.DoesNotExist:
return ErrorResponse(msg="菜单不存在") 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: if next_menu:
next_menu.sort, menu.sort = menu.sort, next_menu.sort next_menu.sort, menu.sort = menu.sort, next_menu.sort
next_menu.save() next_menu.save()