github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: login show system org

pull/14674/head
Bai 2024-12-17 19:04:35 +08:00 committed by Bryan
parent a7d4c4ca2a
commit c4066a03fa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/orgs/utils.py
View File

@ -24,13 +24,13 @@ def get_org_from_request(request):
# 其次session # 其次session
if not oid: if not oid:
oid = request.session.get("oid") oid = request.session.get("oid")
if oid and oid.lower() == 'default': if oid and oid.lower() == 'default':
return Organization.default() return Organization.default()
if oid and oid.lower() == 'root': if oid and oid.lower() == 'root':
return Organization.root() return Organization.root()
if oid and oid.lower() == 'system': if oid and oid.lower() == 'system':
return Organization.system() return Organization.system()
@ -39,14 +39,14 @@ def get_org_from_request(request):
if org and org.internal: if org and org.internal:
# 内置组织直接返回 # 内置组织直接返回
return org return org
if not settings.XPACK_ENABLED: if not settings.XPACK_ENABLED:
# 社区版用户只能使用默认组织 # 社区版用户只能使用默认组织
return Organization.default() return Organization.default()
if not org and request.user.is_authenticated: 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: if not org:
org = Organization.default() org = Organization.default()