From af3dc599c16e5d590d24de96e597ae3aaa3a91b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 3 Jan 2025 17:15:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96TenantId=E9=A1=BA=E5=BA=8F?=
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 9edba14..8c5f48d 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
@@ -78,21 +78,21 @@ public class BaseController {
     if (loginUser != null) {
       return loginUser.getTenantId();
     }
-    // 2 从域名拿ID
+    // 2 从请求头拿ID
+    String tenantId = request.getHeader("tenantId");
+    if(StrUtil.isNotBlank(tenantId)){
+      return Integer.valueOf(tenantId);
+    }
+    // 3 从域名拿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);
       }
     }
-    // 3 从请求头拿ID
-    String tenantId = request.getHeader("tenantId");
-    if(StrUtil.isNotBlank(tenantId)){
-      return Integer.valueOf(tenantId);
-    }
     return null;
   }