From 3d03a5b3193f98929561ea11a37ef8d8b12a4b06 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 11 一月 2024 23:21:24 +0800
Subject: [PATCH] fix 修复 用户登录查询部门缓存无法获取租户id问题
---
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