Sfoglia il codice sorgente

fix 修复 用户未设置部门 登录报错问题

疯狂的狮子Li 2 anni fa
parent
commit
76586e0fee

+ 4 - 1
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));