diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py index 6870942da..7a4576e23 100644 --- a/apps/orgs/utils.py +++ b/apps/orgs/utils.py @@ -11,12 +11,18 @@ from .models import Organization def get_org_from_request(request): - oid = request.META.get("HTTP_X_JMS_ORG") + # query中优先级最高 + oid = request.GET.get("oid") + + # 其次header + if not oid: + oid = request.META.get("HTTP_X_JMS_ORG") + # 其次cookie + if not oid: + oid = request.COOKIES.get('X-JMS-ORG') + # 其次session if not oid: oid = request.session.get("oid") - request_params_oid = request.GET.get("oid") - if request_params_oid: - oid = request.GET.get("oid") if not oid: oid = Organization.DEFAULT_ID