revert: restore gvsdsdk role/permission APIs; keep KefuProfile login fix
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -102,19 +102,15 @@ def is_system_super_admin(user):
|
||||
|
||||
|
||||
def is_kefu_backend_account(user):
|
||||
"""可登录客服后台:超管 / UserType=kefu / KefuProfile / 旧表 user_role 有绑定。"""
|
||||
"""可登录客服后台:超管 / UserType=kefu / 有正常 KefuProfile。"""
|
||||
if is_system_super_admin(user):
|
||||
return True
|
||||
if getattr(user, 'UserType', '') == 'kefu':
|
||||
return True
|
||||
try:
|
||||
kefu = user.KefuProfile
|
||||
if kefu.zhuangtai == 1:
|
||||
return True
|
||||
return user.KefuProfile.zhuangtai == 1
|
||||
except Exception:
|
||||
pass
|
||||
from backend.utils import has_legacy_backend_binding
|
||||
return has_legacy_backend_binding(user)
|
||||
return False
|
||||
|
||||
|
||||
def can_manage_admin_assignments(user, permissions=None):
|
||||
|
||||
@@ -79,11 +79,16 @@ def resolve_role_by_name(role_name, club_id=None):
|
||||
def user_bound_role_names(user):
|
||||
from backend.utils import _legacy_backend_role_permissions
|
||||
|
||||
_, legacy_names = _legacy_backend_role_permissions(
|
||||
getattr(user, 'Phone', ''),
|
||||
getattr(user, 'UserUID', None),
|
||||
uuids = list(
|
||||
UserRole.objects.filter(UserUUID=user.UserUUID).values_list('RoleUUID', flat=True)
|
||||
)
|
||||
return sorted(set(legacy_names))
|
||||
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