From a3ecc71558bbbc8243a4fdefff252ca3bc2234a2 Mon Sep 17 00:00:00 2001
From: Yjoioooo <5403234+zj_Gitttttttte@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 17:54:55 +0800
Subject: [PATCH] !301 fix 修复 租户套餐导出接口地址错误 修复 删除弹窗提示错误 fix 修复 租户套餐导出接口地址错误 fix 修复 删除弹窗提示错误
---
ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
index fe3af8e..c8357cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
@@ -216,6 +216,9 @@
log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
throw new UserException("user.blocked", username);
}
+ if (TenantHelper.isEnable()) {
+ return userMapper.selectTenantUserByUserName(username, tenantId);
+ }
return userMapper.selectUserByUserName(username);
}
@@ -231,6 +234,9 @@
log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", phonenumber);
throw new UserException("user.blocked", phonenumber);
}
+ if (TenantHelper.isEnable()) {
+ return userMapper.selectTenantUserByPhonenumber(phonenumber, tenantId);
+ }
return userMapper.selectUserByPhonenumber(phonenumber);
}
--
Gitblit v1.9.3