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;
   }
 
+
   /**
    * 获取当前登录的企业信息
    *