public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-04-27 09:39:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 登录用户增加岗位数据

Browse Source
This commit is contained in:
疯狂的狮子Li
2024-12-12 23:51:01 +08:00
parent 9c55e4efc8
commit 02ace774a6
5 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
View File

@@ -18,11 +18,13 @@ import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.bo.RemoteUserBo;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.system.api.model.LoginUser;
import org.dromara.system.api.model.PostDTO;
import org.dromara.system.api.model.RoleDTO;
import org.dromara.system.api.model.XcxLoginUser;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysPostVo;
import org.dromara.system.domain.vo.SysRoleVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
@@ -46,6 +48,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
private final ISysConfigService configService;
private final ISysRoleService roleService;
private final ISysDeptService deptService;
private final ISysPostService postService;
private final SysUserMapper userMapper;
/**
@@ -250,22 +253,25 @@ public class RemoteUserServiceImpl implements RemoteUserService {
*/
private LoginUser buildLoginUser(SysUserVo userVo) {
LoginUser loginUser = new LoginUser();
Long userId = userVo.getUserId();
loginUser.setTenantId(userVo.getTenantId());
loginUser.setUserId(userVo.getUserId());
loginUser.setUserId(userId);
loginUser.setDeptId(userVo.getDeptId());
loginUser.setUsername(userVo.getUserName());
loginUser.setNickname(userVo.getNickName());
loginUser.setPassword(userVo.getPassword());
loginUser.setUserType(userVo.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId()));
loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
loginUser.setRolePermission(permissionService.getRolePermission(userId));
if (ObjectUtil.isNotNull(userVo.getDeptId())) {
Opt<SysDeptVo> deptOpt = Opt.of(userVo.getDeptId()).map(deptService::selectDeptById);
loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
}
List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId());
List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
List<SysPostVo> posts = postService.selectPostsByUserId(userId);
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
return loginUser;
}

8
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java
View File

@@ -25,6 +25,14 @@ public interface ISysPostService {
*/
List<SysPostVo> selectPostList(SysPostBo post);
/**
* 查询用户所属岗位组
*
* @param userId 用户ID
* @return 岗位ID
*/
List<SysPostVo> selectPostsByUserId(Long userId);
/**
* 查询所有岗位
*

11
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
View File

@@ -57,6 +57,17 @@ public class SysPostServiceImpl implements ISysPostService {
return baseMapper.selectVoList(buildQueryWrapper(post));
}
/**
* 查询用户所属岗位组
*
* @param userId 用户ID
* @return 岗位ID
*/
@Override
public List<SysPostVo> selectPostsByUserId(Long userId) {
return baseMapper.selectPostsByUserId(userId);
}
/**
* 根据查询条件构建查询包装器
*