From dbef39a7a68d79f53636dfe8cf9c0f0c1355e891 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 11 三月 2024 10:59:01 +0800 Subject: [PATCH] update copyright 2024 --- ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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..fa8b1db 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,12 +145,12 @@ loginUser.setUserType(user.getUserType()); loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId())); loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId())); - SysDeptVo dept = deptMapper.selectVoById(user.getDeptId()); - loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName()); - List<SysRoleVo> roles = DataPermissionHelper.ignore(() -> { - return roleService.selectRolesByUserId(user.getUserId()); + TenantHelper.dynamic(user.getTenantId(), () -> { + SysDeptVo dept = deptService.selectDeptById(user.getDeptId()); + loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName()); + List<SysRoleVo> roles = roleService.selectRolesByUserId(user.getUserId()); + loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); }); - loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); return loginUser; } -- Gitblit v1.9.3