合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

@@ -142,10 +142,26 @@ public class UserServiceImpl implements IUserService {
         if(byId.isPresent()){
             user = byId.get();
             List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
-            for (UserRole userRole : userRoles) {
-                roleIds.add(userRole.getRoleId());
+            if(userRoles!=null){
+                for (UserRole userRole : userRoles) {
+                    roleIds.add(userRole.getRoleId());
+                }
             }
+
             List<Role> roles = roleDao.findAllByIdIn(roleIds);
+            if(roles!=null){
+                for (Role role : roles) {
+                    List<RoleAuthority> roleAuthorities = roleAuthorityDao.findAllByRoleId(role.getId());
+                    List<String> authorityIds = new ArrayList<>();
+                    if(roleAuthorities!=null){
+                        for (RoleAuthority roleAuthority : roleAuthorities) {
+                            authorityIds.add(roleAuthority.getAuthorityId());
+                        }
+                    }
+                    List<Authority> authorities = authorityDao.findAllByIdIn(authorityIds);
+                    role.setAuthorities(authorities);
+                }
+            }
             user.setRoles(roles);
         }
         return user;