|
@@ -188,13 +188,13 @@ public class SysLoginController {
|
|
|
return AjaxResult.error("未有此用户信息");
|
|
|
}
|
|
|
// 生成令牌
|
|
|
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
|
|
|
+ String token = loginService.login(loginBody.getTenantID() + "¥¥¥" + loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
|
|
|
loginBody.getUuid(), false);
|
|
|
if (tokenService.getLoginUserIsAdminByToken(token)) {
|
|
|
return AjaxResult.error("用户不存在!");
|
|
|
}
|
|
|
//检查租户过期时间
|
|
|
- String checkTenantExpirationTimeMsg = loginService.checkTenantExpirationTime(loginBody.getUsername());
|
|
|
+ String checkTenantExpirationTimeMsg = loginService.checkTenantExpirationTime(loginBody.getTenantID() + "¥¥¥" +loginBody.getUsername());
|
|
|
if (!checkTenantExpirationTimeMsg.isEmpty()) {
|
|
|
return AjaxResult.error(checkTenantExpirationTimeMsg);
|
|
|
}
|