From 18b35f1400df83e20a870dbfd7e97ae9ca277cbd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
index d9d6d25..dea12b4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
@@ -35,17 +35,19 @@
if (Cools.isEmpty(username)) {
return null;
}
- User user = baseMapper.selectByUsername(username, tenantId);
- if (user != null) {
- user.setRoles(userRoleService.listByUserId(user.getId()));
- user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
- }
- return user;
+ return baseMapper.selectByUsernameWithoutTenant(username, tenantId);
}
@Override
- public User getByIdRel(Long userId) {
- User user = this.getById(userId);
+ public User getByEmail(String email, Long tenantId) {
+ if (Cools.isEmpty(email)) {
+ return null;
+ }
+ return baseMapper.selectByEmailWithoutTenant(email, tenantId);
+ }
+
+ @Override
+ public User setUserAuthInfo(User user) {
if (user != null) {
user.setRoles(userRoleService.listByUserId(user.getId()));
user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
@@ -63,4 +65,9 @@
return password == null ? null : bCryptPasswordEncoder.encode(password);
}
+ @Override
+ public User selectByUsernameWithoutTenant(String username, Long tenantId) {
+ return baseMapper.selectByUsernameWithoutTenant(username,tenantId);
+ }
+
}
--
Gitblit v1.9.1