fix: system org

pull/14725/head
Bai 2024-12-25 15:31:48 +08:00 committed by Bryan
parent ae94648e80
commit 11f6fe0bf9
3 changed files with 7 additions and 6 deletions

View File

@ -38,7 +38,7 @@ class OrgSerializer(ModelSerializer):
class CurrentOrgSerializer(ModelSerializer):
class Meta:
model = Organization
fields = ['id', 'name', 'is_default', 'is_root', 'comment']
fields = ['id', 'name', 'is_default', 'is_root', 'is_system', 'comment']
class CurrentOrgDefault:

View File

@ -46,7 +46,7 @@ def get_org_from_request(request):
if not org and request.user.is_authenticated:
# 企业版用户优先从自己有权限的组织中获取
org = request.user.orgs.first()
org = request.user.orgs.exclude(id=Organization.SYSTEM_ID).first()
if not org:
org = Organization.default()

View File

@ -12,6 +12,7 @@ class UserOrgSerializer(serializers.Serializer):
id = serializers.CharField()
name = serializers.CharField()
is_default = serializers.BooleanField(read_only=True)
is_system = serializers.BooleanField(read_only=True)
is_root = serializers.BooleanField(read_only=True)