From e1cac1af6129216da66e569ddec892dd1f07fe80 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 25 二月 2026 10:14:37 +0800
Subject: [PATCH] 站点复制功能
---
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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..d532c92 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
@@ -5,6 +5,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.domain.PageResult;
+import com.vincent.rsf.server.system.entity.Role;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.mapper.UserMapper;
import com.vincent.rsf.server.system.service.RoleMenuService;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
@Service("userService")
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
@@ -35,7 +37,19 @@
if (Cools.isEmpty(username)) {
return null;
}
- User user = baseMapper.selectByUsername(username, tenantId);
+ return baseMapper.selectByUsernameWithoutTenant(username, tenantId);
+ }
+
+ @Override
+ 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));
@@ -44,12 +58,12 @@
}
@Override
- public User getByIdRel(Long userId) {
- User user = this.getById(userId);
- if (user != null) {
- user.setRoles(userRoleService.listByUserId(user.getId()));
- user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+ public User fillRoleIdsForResponse(User user) {
+ if (user == null || user.getId() == null) {
+ return user;
}
+ List<Role> roles = userRoleService.listByUserId(user.getId());
+ user.setRoleIds(roles.stream().map(Role::getId).toArray(Long[]::new));
return user;
}
@@ -63,4 +77,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