diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 086bf2136..a8a60f44a 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -197,7 +197,8 @@ class RoleMixin: else: # 是真实组织, 取 OrganizationMember 中的角色 roles = [ - org_member.role for org_member in self.m2m_org_members.all() + getattr(ORG_ROLE, org_member.role.upper()) + for org_member in self.m2m_org_members.all() if org_member.org_id == current_org.id ] roles.sort() @@ -206,7 +207,7 @@ class RoleMixin: @lazyproperty def org_roles_label_list(self): from orgs.models import ROLE as ORG_ROLE - return [str(ORG_ROLE[role]) for role in self.org_roles if role in ORG_ROLE] + return [str(role.label) for role in self.org_roles if role in ORG_ROLE] @lazyproperty def org_role_display(self):