mirror of https://github.com/jumpserver/jumpserver
fix: 修复角色列表用户数量字段为0的问题
parent
44d3f88225
commit
ac4a321225
|
@ -69,8 +69,10 @@ class RoleViewSet(JMSModelViewSet):
|
||||||
role.users_amount = role_user_amount_mapper.get(role.id, 0)
|
role.users_amount = role_user_amount_mapper.get(role.id, 0)
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
def page_queryset(self, queryset):
|
def paginate_queryset(self, queryset):
|
||||||
queryset = super().page_queryset(queryset)
|
page_queryset = super().paginate_queryset(queryset) # 返回是 list 对象
|
||||||
|
page_queryset_ids = [str(i.id) for i in page_queryset]
|
||||||
|
queryset = queryset.filter(id__in=page_queryset_ids)
|
||||||
queryset = self.set_users_amount(queryset)
|
queryset = self.set_users_amount(queryset)
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
|
|
|
@ -102,7 +102,7 @@ class Role(JMSBaseModel):
|
||||||
|
|
||||||
@lazyproperty
|
@lazyproperty
|
||||||
def users_amount(self):
|
def users_amount(self):
|
||||||
return 0
|
return self.users.count()
|
||||||
|
|
||||||
@lazyproperty
|
@lazyproperty
|
||||||
def permissions_amount(self):
|
def permissions_amount(self):
|
||||||
|
|
Loading…
Reference in New Issue