From fb501e5a1f0430df02524feaf033905f35f7ef79 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Fri, 17 May 2024 16:43:06 +0800
Subject: [PATCH] 1

---
 .../common/system/controller/MainController.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index 856d5a2..7169f5e 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -87,7 +87,14 @@ public class MainController extends BaseController {
   @PostMapping("/login")
   public ApiResult<LoginResult> login(@RequestBody LoginParam param, HttpServletRequest request) {
     String username = param.getUsername();
-    Integer tenantId = getTenantId();
+    Integer tenantId;
+    if(param.getTenantId() != null){
+      // 表单主动交租户ID
+      tenantId = param.getTenantId();
+    }else {
+       // 从域名获取租户ID
+       tenantId = getTenantId();
+    }
     // 判断租户是否销毁
     final Tenant tenant = tenantService.getById(tenantId);
     if (tenant == null) {