Merge remote-tracking branch 'origin/dev' into dev

whycq

2025-02-24 37e8e06c8d13146e62ef08d018d86443b9f42f00

 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));