From 606290e185b1c95b3379db39799f22fe02b39bcd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 08 一月 2024 12:04:44 +0800
Subject: [PATCH] !477 JustAuth 整合 TopIam 单点登录 Merge pull request !477 from 马铃薯头/dev
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index a269d38..f9b7f2c 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/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;
}
--
Gitblit v1.9.3