opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !181 from Mincycle/N/A

Browse Source
This commit is contained in:
Mincycle 2022-05-26 15:16:15 +00:00 committed by Gitee
commit 7a3f545a8a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -205,7 +205,8 @@ public class SysLoginService {
loginUser.setUserType(user.getUserType()); loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user)); loginUser.setMenuPermission(permissionService.getMenuPermission(user));
loginUser.setRolePermission(permissionService.getRolePermission(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); List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
loginUser.setRoles(roles); loginUser.setRoles(roles);
return loginUser; return loginUser;