From 9d355750518c2f9d771b59a05920354faeaa19af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 三月 2024 10:37:39 +0800
Subject: [PATCH] update springboot 3.2.3 => 3.2.4 update springdoc 2.3.0 => 2.4.0 update springboot-admin 3.2.2 => 3.2.3 update redisson 3.27.0 => 3.27.2 update sms4j 3.1.1 => 3.2.0
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 6 ++++--
1 files changed, 4 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 fa8b1db..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
@@ -26,7 +26,6 @@
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysSocialBo;
import org.dromara.system.domain.vo.*;
-import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.*;
import org.springframework.beans.factory.annotation.Value;
@@ -146,7 +145,10 @@
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
TenantHelper.dynamic(user.getTenantId(), () -> {
- SysDeptVo dept = deptService.selectDeptById(user.getDeptId());
+ 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));
--
Gitblit v1.9.3