From 4d4a10710184f611ede99c4bcf61921a8c717508 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 9 Jun 2020 16:43:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9oid=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BB=8Ecookie?=
 =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/orgs/utils.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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