代码修改

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

@@ -308,6 +308,27 @@ public class UserServiceImpl implements IUserService {
         if(all!=null){
             for (User user : all) {
                 List<String> departmentIds = user.getDepartmentIds();
+                List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
+                List<String> roleIds = new ArrayList<>();
+                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<>();
+                        for (RoleAuthority roleAuthority : roleAuthorities) {
+                            authorityIds.add(roleAuthority.getAuthorityId());
+                        }
+                        List<Authority> authorities = authorityDao.findAllByIdIn(authorityIds);
+                        role.setAuthorities(authorities);
+                    }
+                }
+                user.setRoles(roles);
+
                 if(departmentIds!=null){
                     for (String departId : departmentIds) {
                         if(departmentList.contains(departId)){