From 5d38f4bb77fdd3e6980814fe90390ea45e423972 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 三月 2024 16:33:11 +0800
Subject: [PATCH] fix 修复 用户未设置部门 登录报错问题
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 28332a3..b2c9d3a 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
@@ -25,15 +25,9 @@
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysSocialBo;
-import org.dromara.system.domain.vo.SysRoleVo;
-import org.dromara.system.domain.vo.SysSocialVo;
-import org.dromara.system.domain.vo.SysTenantVo;
-import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.domain.vo.*;
import org.dromara.system.mapper.SysUserMapper;
-import org.dromara.system.service.ISysPermissionService;
-import org.dromara.system.service.ISysRoleService;
-import org.dromara.system.service.ISysSocialService;
-import org.dromara.system.service.ISysTenantService;
+import org.dromara.system.service.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -62,6 +56,7 @@
private final ISysPermissionService permissionService;
private final ISysSocialService sysSocialService;
private final ISysRoleService roleService;
+ private final ISysDeptService deptService;
private final SysUserMapper userMapper;
@@ -149,11 +144,15 @@
loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
- loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
- List<SysRoleVo> roles = DataPermissionHelper.ignore(() -> {
- return roleService.selectRolesByUserId(user.getUserId());
+ TenantHelper.dynamic(user.getTenantId(), () -> {
+ SysDeptVo dept = null;
+ if (ObjectUtil.isNotNull(user.getDeptId())) {
+ 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