From 76586e0fee42c719b4ff92f29e16d136259d3ddb 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: Mon, 11 Mar 2024 16:35:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E9=83=A8=E9=97=A8=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/system/dubbo/RemoteUserServiceImpl.java | 5 ++++-
 1 file changed, 4 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 b0133429..246417e0 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
@@ -207,7 +207,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId()));
         loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId()));
         TenantHelper.dynamic(userVo.getTenantId(), () -> {
-            SysDeptVo dept = deptService.selectDeptById(userVo.getDeptId());
+            SysDeptVo dept = null;
+            if (ObjectUtil.isNotNull(userVo.getUserId())) {
+                dept = deptService.selectDeptById(userVo.getDeptId());
+            }
             loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
             List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId());
             loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));