修复BUG: 修复菜单获取按钮权限列表bug
parent
b20e846ee0
commit
75db7ae163
|
@ -23,7 +23,7 @@ class MenuSerializer(CustomModelSerializer):
|
||||||
menuPermission = serializers.SerializerMethodField(read_only=True)
|
menuPermission = serializers.SerializerMethodField(read_only=True)
|
||||||
|
|
||||||
def get_menuPermission(self, instance):
|
def get_menuPermission(self, instance):
|
||||||
queryset = MenuButton.objects.filter(menu=instance.id).order_by('-name').values_list('name', flat=True)
|
queryset = instance.menuPermission.order_by('-name').values_list('name', flat=True)
|
||||||
if queryset:
|
if queryset:
|
||||||
return queryset
|
return queryset
|
||||||
else:
|
else:
|
||||||
|
@ -65,7 +65,7 @@ class MenuInitSerializer(CustomModelSerializer):
|
||||||
|
|
||||||
def get_menu_button(self, obj: Menu):
|
def get_menu_button(self, obj: Menu):
|
||||||
data = []
|
data = []
|
||||||
instance = MenuButton.objects.filter(menu_id=obj.id).order_by('method')
|
instance = obj.menuPermission.order_by('method')
|
||||||
if instance:
|
if instance:
|
||||||
data = list(instance.values('name', 'value', 'api', 'method'))
|
data = list(instance.values('name', 'value', 'api', 'method'))
|
||||||
return data
|
return data
|
||||||
|
@ -124,11 +124,11 @@ class WebRouterSerializer(CustomModelSerializer):
|
||||||
def get_menuPermission(self, instance):
|
def get_menuPermission(self, instance):
|
||||||
# 判断是否是超级管理员
|
# 判断是否是超级管理员
|
||||||
if self.request.user.is_superuser:
|
if self.request.user.is_superuser:
|
||||||
return MenuButton.objects.values_list('value', flat=True)
|
return instance.menuPermission.values_list('value', flat=True)
|
||||||
else:
|
else:
|
||||||
# 根据当前角色获取权限按钮id集合
|
# 根据当前角色获取权限按钮id集合
|
||||||
permissionIds = self.request.user.role.values_list('permission', flat=True)
|
permissionIds = self.request.user.role.values_list('permission', flat=True)
|
||||||
queryset = MenuButton.objects.filter(id__in=permissionIds, menu=instance.id).values_list('value', flat=True)
|
queryset = instance.menuPermission.filter(id__in=permissionIds, menu=instance.id).values_list('value', flat=True)
|
||||||
if queryset:
|
if queryset:
|
||||||
return queryset
|
return queryset
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue