1.7 优化

nick-tan · Apr 16, 2019 · 4486384 · 4486384
1 parent 5a88fee
commit 4486384
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java
@@ -1,8 +1,6 @@
 package me.zhengjie.modules.security.service;
 
-import me.zhengjie.modules.system.domain.Permission;
-import me.zhengjie.modules.system.domain.Role;
-import me.zhengjie.modules.system.domain.User;
+import me.zhengjie.modules.system.domain.*;
 import me.zhengjie.exception.EntityNotFoundException;
 import me.zhengjie.modules.system.repository.PermissionRepository;
 import me.zhengjie.modules.system.repository.RoleRepository;
@@ -19,6 +17,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -55,8 +54,8 @@ public UserDetails createJwtUser(User user) {
                 user.getAvatar(),
                 user.getEmail(),
                 user.getPhone(),
-                user.getDept().getName(),
-                user.getJob().getName(),
+                Optional.ofNullable(user.getDept()).map(Dept::getName).orElse(null),
+                Optional.ofNullable(user.getJob()).map(Job::getName).orElse(null),
                 permissionService.mapToGrantedAuthorities(user),
                 user.getEnabled(),
                 user.getCreateTime(),