From 44d98bdf6e3648d4d43f1d5a2f3f5d6ef3e64574 Mon Sep 17 00:00:00 2001
From: Mincycle <805269940@qq.com>
Date: Thu, 26 May 2022 15:16:14 +0000
Subject: [PATCH] =?UTF-8?q?update=20ruoyi-system/src/main/java/com/ruoyi/s?=
 =?UTF-8?q?ystem/service/SysLoginService.java.=20loginUser.setDeptName(use?=
 =?UTF-8?q?r.getDept().getDeptName());=20=E6=9C=AA=E9=80=89=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=83=85=E5=86=B5=E4=B8=8B=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=A0=E6=88=90=E8=BF=99=E4=B8=AA=E5=9C=B0=E6=96=B9?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/system/service/SysLoginService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index e0b53c1fb..d16055454 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -205,7 +205,8 @@ public class SysLoginService {
         loginUser.setUserType(user.getUserType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user));
         loginUser.setRolePermission(permissionService.getRolePermission(user));
-        loginUser.setDeptName(user.getDept().getDeptName());
+        
+        loginUser.setDeptName(user.getDept()!=null?user.getDept.getDeptName():null);
         List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
         loginUser.setRoles(roles);
         return loginUser;