This commit is contained in:
gxwebsoft
2024-05-17 16:43:06 +08:00
parent d0781c0122
commit fb501e5a1f

View File

@@ -87,7 +87,14 @@ public class MainController extends BaseController {
@PostMapping("/login") @PostMapping("/login")
public ApiResult<LoginResult> login(@RequestBody LoginParam param, HttpServletRequest request) { public ApiResult<LoginResult> login(@RequestBody LoginParam param, HttpServletRequest request) {
String username = param.getUsername(); 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); final Tenant tenant = tenantService.getById(tenantId);
if (tenant == null) { if (tenant == null) {