jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-23 23:09:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 使用翻译注解简化用户查询 调整用户查询逻辑

Browse Source 
update 优化 使用翻译注解简化用户查询 调整用户查询逻辑
This commit is contained in:
疯狂的狮子Li
2024-01-06 20:47:05 +08:00
parent a7bb4ee50c
commit e7ca94bab1
10 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
View File

@ -57,7 +57,7 @@ public class SysLoginService {
private final ISysPermissionService permissionService;
private final ISysSocialService sysSocialService;
private final ISysRoleService roleService;
private final SysDeptMapper deptMapper;
private final ISysDeptService deptService;
private final SysUserMapper userMapper;
@ -145,11 +145,9 @@ public class SysLoginService {
loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
SysDeptVo dept = deptMapper.selectVoById(user.getDeptId());
SysDeptVo dept = deptService.selectDeptById(user.getDeptId());
loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
List<SysRoleVo> roles = DataPermissionHelper.ignore(() -> {
return roleService.selectRolesByUserId(user.getUserId());
});
List<SysRoleVo> roles = roleService.selectRolesByUserId(user.getUserId());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
return loginUser;
}