合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/config/MyUserDetailsServiceImpl.java

@@ -49,8 +49,10 @@ public class MyUserDetailsServiceImpl implements UserDetailsService {
         if(user!=null){
             List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
             List<String> roleIds = new ArrayList<>();
-            for (UserRole userRole : userRoles) {
-                roleIds.add(userRole.getRoleId());
+            if(userRoles!=null){
+                for (UserRole userRole : userRoles) {
+                    roleIds.add(userRole.getRoleId());
+                }
             }
             user.setUsername(username);
             user.setPassword(bCryptPasswordEncoder.encode(user.getPassword()));
@@ -58,11 +60,14 @@ public class MyUserDetailsServiceImpl implements UserDetailsService {
             List<Role> roles = roleDao.findAllByIdIn(roleIds);
             List<RoleAuthority> roleAuthorities = roleAuthorityDao.findAllByRoleIdIn(roleIds);
             List<String> authorityIds = new ArrayList<>();
-            for (RoleAuthority roleAuthority : roleAuthorities) {
-                if(!authorityIds.contains(roleAuthority.getAuthorityId())){
-                    authorityIds.add(roleAuthority.getAuthorityId());
+            if(roleAuthorities!=null){
+                for (RoleAuthority roleAuthority : roleAuthorities) {
+                    if(!authorityIds.contains(roleAuthority.getAuthorityId())){
+                        authorityIds.add(roleAuthority.getAuthorityId());
+                    }
                 }
             }
+
             List<Authority> authorities = authorityDao.findAllByIdIn(authorityIds);
             authorities.forEach(authority -> {
                 list.add(new SimpleGrantedAuthority(authority.getName()));