1

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) {