From 2cf7c45ac52697b142c15c35b550440f4a8e4758 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 29 十二月 2023 11:50:55 +0800
Subject: [PATCH] update 优化 删除已经无用的依赖
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 ef5335f..28332a3 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,11 +25,13 @@
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.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.springframework.beans.factory.annotation.Value;
@@ -59,6 +61,7 @@
private final ISysTenantService tenantService;
private final ISysPermissionService permissionService;
private final ISysSocialService sysSocialService;
+ private final ISysRoleService roleService;
private final SysUserMapper userMapper;
@@ -97,6 +100,9 @@
public void logout() {
try {
LoginUser loginUser = LoginHelper.getLoginUser();
+ if (ObjectUtil.isNull(loginUser)) {
+ return;
+ }
if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
// 瓒呯骇绠＄悊鍛� 鐧诲嚭娓呴櫎鍔ㄦ�佺鎴�
TenantHelper.clearDynamic();
@@ -144,8 +150,10 @@
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
- List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
- loginUser.setRoles(roles);
+ List<SysRoleVo> roles = DataPermissionHelper.ignore(() -> {
+ return roleService.selectRolesByUserId(user.getUserId());
+ });
+ loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
return loginUser;
}
--
Gitblit v1.9.3