fix: merge legacy user_role permissions with gvsdsdk for kefu login
This commit is contained in:
@@ -77,14 +77,18 @@ def resolve_role_by_name(role_name, club_id=None):
|
||||
|
||||
|
||||
def user_bound_role_names(user):
|
||||
from backend.utils import _legacy_backend_role_permissions
|
||||
|
||||
uuids = list(
|
||||
UserRole.objects.filter(UserUUID=user.UserUUID).values_list('RoleUUID', flat=True)
|
||||
)
|
||||
if not uuids:
|
||||
return []
|
||||
return list(
|
||||
Role.objects.filter(RoleUUID__in=uuids, RoleStatus=1).values_list('RoleName', flat=True)
|
||||
)
|
||||
names = []
|
||||
if uuids:
|
||||
names = list(
|
||||
Role.objects.filter(RoleUUID__in=uuids, RoleStatus=1).values_list('RoleName', flat=True)
|
||||
)
|
||||
_, legacy_names = _legacy_backend_role_permissions(getattr(user, 'Phone', ''))
|
||||
return sorted(set(names + legacy_names))
|
||||
|
||||
|
||||
def resolve_kefu_admin_user(yonghuid=None, phone=None):
|
||||
|
||||
Reference in New Issue
Block a user