From 9e1b6b1446a4e172868e2df5f1ec07195851f973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 26 Dec 2024 20:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BC=98=E9=80=89?=
 =?UTF-8?q?=E4=BB=8E=E6=8E=88=E6=9D=83=E5=9F=9F=E5=90=8D=E6=8B=BF=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/web/BaseController.java       | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
index 16cac88..9edba14 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
@@ -73,29 +73,30 @@ public class BaseController {
    * @return tenantId
    */
   public Integer getTenantId() {
-    // 1 从请求头拿ID
-    String tenantId = request.getHeader("tenantId");
-    if(StrUtil.isNotBlank(tenantId)){
-      return Integer.valueOf(tenantId);
-    }
-    // 2 从域名拿ID
-    String Domain = request.getHeader("Domain");
-    if (StrUtil.isNotBlank(Domain)) {
-      String key = "Domain:" + Domain;
-      tenantId = redisUtil.get(key);
-      if(tenantId != null){
-        System.out.println("从域名拿ID = " + tenantId);
-        return Integer.valueOf(tenantId);
-      }
-    }
     // 1 从登录用户拿tenantId
     User loginUser = getLoginUser();
     if (loginUser != null) {
       return loginUser.getTenantId();
     }
+    // 2 从域名拿ID
+    String Domain = request.getHeader("Domain");
+    if (StrUtil.isNotBlank(Domain)) {
+      String key = "Domain:" + Domain;
+      String tenantId = redisUtil.get(key);
+      if(tenantId != null){
+        System.out.println("从域名拿ID = " + tenantId);
+        return Integer.valueOf(tenantId);
+      }
+    }
+    // 3 从请求头拿ID
+    String tenantId = request.getHeader("tenantId");
+    if(StrUtil.isNotBlank(tenantId)){
+      return Integer.valueOf(tenantId);
+    }
     return null;
   }
 
+
   /**
    * 获取当前登录的企业信息
    *