From f31176249774dac1ae7ba42ca34bbb44786e55af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 29 Dec 2023 13:18:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=9C=AA=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/dubbo/RemoteUserServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
index aa65ded4..436605f5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
@@ -19,8 +19,10 @@ import org.dromara.system.api.model.RoleDTO;
 import org.dromara.system.api.model.XcxLoginUser;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.domain.vo.SysRoleVo;
 import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysConfigService;
 import org.dromara.system.service.ISysPermissionService;
@@ -44,6 +46,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     private final ISysPermissionService permissionService;
     private final ISysConfigService configService;
     private final ISysRoleService roleService;
+    private final SysDeptMapper deptMapper;
     private final SysUserMapper userMapper;
 
     @Override
@@ -173,7 +176,8 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         loginUser.setUserType(userVo.getUserType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId()));
         loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId()));
-        loginUser.setDeptName(ObjectUtil.isNull(userVo.getDept()) ? "" : userVo.getDept().getDeptName());
+        SysDeptVo dept = deptMapper.selectVoById(userVo.getDeptId());
+        loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
         List<SysRoleVo> roles = DataPermissionHelper.ignore(() -> {
             return roleService.selectRolesByUserId(userVo.getUserId());
         });