Browse Source

fix 修复 用户登录查询部门缓存无法获取租户id问题

疯狂的狮子Li 1 year ago
parent
commit
3d03a5b319

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

@@ -145,10 +145,12 @@ public class SysLoginService {
         loginUser.setUserType(user.getUserType());
         loginUser.setUserType(user.getUserType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
         loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
         loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
         loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
-        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));
+        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));
+        });
         return loginUser;
         return loginUser;
     }
     }