Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/core/web/BaseController.java

@@ -73,7 +73,12 @@ public class BaseController {
    * @return tenantId
    */
   public Integer getTenantId() {
-    // 1 从域名拿ID
+    // 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;
@@ -83,19 +88,15 @@ public class BaseController {
         return Integer.valueOf(tenantId);
       }
     }
-    // 2 从请求头拿ID
+    // 3 从请求头拿ID
     String tenantId = request.getHeader("tenantId");
     if(StrUtil.isNotBlank(tenantId)){
       return Integer.valueOf(tenantId);
     }
-    // 1 从登录用户拿tenantId
-    User loginUser = getLoginUser();
-    if (loginUser != null) {
-      return loginUser.getTenantId();
-    }
     return null;
   }
 
+
   /**
    * 获取当前登录的企业信息
    *