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

疯狂的狮子Li

2024-01-06 e7ca94bab1ef85efe4786a38669e2cca97ac406d

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

@@ -57,7 +57,7 @@
    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 @@
        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;
    }