|
@@ -133,16 +133,18 @@ public class SysLoginController
|
|
public Response<UserInfoDTO> getInfo()
|
|
public Response<UserInfoDTO> getInfo()
|
|
{
|
|
{
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
- SysUser user = loginUser.getUser();
|
|
|
|
- // 角色集合
|
|
|
|
- Set<String> roles = permissionService.getRolePermission(user);
|
|
|
|
- // 权限集合
|
|
|
|
- Set<String> permissions = permissionService.getMenuPermission(user);
|
|
|
|
UserInfoDTO userInfoDTO = new UserInfoDTO();
|
|
UserInfoDTO userInfoDTO = new UserInfoDTO();
|
|
- userInfoDTO.setUser(user);
|
|
|
|
|
|
+ SysUser user = loginUser.getUser();
|
|
|
|
+ if (user != null){
|
|
|
|
+ userInfoDTO.setUser(user);
|
|
|
|
+ // 角色集合
|
|
|
|
+ Set<String> roles = permissionService.getRolePermission(user);
|
|
|
|
+ // 权限集合
|
|
|
|
+ Set<String> permissions = permissionService.getMenuPermission(user);
|
|
|
|
+ userInfoDTO.setRoles(roles);
|
|
|
|
+ userInfoDTO.setPermissions(permissions);
|
|
|
|
+ }
|
|
userInfoDTO.setStudent(loginUser.getStudent());
|
|
userInfoDTO.setStudent(loginUser.getStudent());
|
|
- userInfoDTO.setRoles(roles);
|
|
|
|
- userInfoDTO.setPermissions(permissions);
|
|
|
|
return Response.success(userInfoDTO);
|
|
return Response.success(userInfoDTO);
|
|
}
|
|
}
|
|
|
|
|