From 0d63620f5804066b1d69e8ab405f2768debca0e8 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:36:09 +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=E8=AF=B7=E6=B1=82=E5=A4=B4=E6=8B=BF=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/core/web/BaseController.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 cccc5d1..16cac88 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
@@ -73,21 +73,21 @@ public class BaseController {
    * @return tenantId
    */
   public Integer getTenantId() {
-    // 1 从域名拿ID
+    // 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;
-      String tenantId = redisUtil.get(key);
+      tenantId = redisUtil.get(key);
       if(tenantId != null){
         System.out.println("从域名拿ID = " + tenantId);
         return Integer.valueOf(tenantId);
       }
     }
-    // 2 从请求头拿ID
-    String tenantId = request.getHeader("tenantId");
-    if(StrUtil.isNotBlank(tenantId)){
-      return Integer.valueOf(tenantId);
-    }
     // 1 从登录用户拿tenantId
     User loginUser = getLoginUser();
     if (loginUser != null) {