mirror of https://github.com/elunez/eladmin
1.7 优化
parent
5a88fee391
commit
448638479b
|
@ -1,8 +1,6 @@
|
||||||
package me.zhengjie.modules.security.service;
|
package me.zhengjie.modules.security.service;
|
||||||
|
|
||||||
import me.zhengjie.modules.system.domain.Permission;
|
import me.zhengjie.modules.system.domain.*;
|
||||||
import me.zhengjie.modules.system.domain.Role;
|
|
||||||
import me.zhengjie.modules.system.domain.User;
|
|
||||||
import me.zhengjie.exception.EntityNotFoundException;
|
import me.zhengjie.exception.EntityNotFoundException;
|
||||||
import me.zhengjie.modules.system.repository.PermissionRepository;
|
import me.zhengjie.modules.system.repository.PermissionRepository;
|
||||||
import me.zhengjie.modules.system.repository.RoleRepository;
|
import me.zhengjie.modules.system.repository.RoleRepository;
|
||||||
|
@ -19,6 +17,7 @@ import org.springframework.transaction.annotation.Propagation;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@ -55,8 +54,8 @@ public class JwtUserDetailsService implements UserDetailsService {
|
||||||
user.getAvatar(),
|
user.getAvatar(),
|
||||||
user.getEmail(),
|
user.getEmail(),
|
||||||
user.getPhone(),
|
user.getPhone(),
|
||||||
user.getDept().getName(),
|
Optional.ofNullable(user.getDept()).map(Dept::getName).orElse(null),
|
||||||
user.getJob().getName(),
|
Optional.ofNullable(user.getJob()).map(Job::getName).orElse(null),
|
||||||
permissionService.mapToGrantedAuthorities(user),
|
permissionService.mapToGrantedAuthorities(user),
|
||||||
user.getEnabled(),
|
user.getEnabled(),
|
||||||
user.getCreateTime(),
|
user.getCreateTime(),
|
||||||
|
|
Loading…
Reference in New Issue