合并分支 'gwj' 到 'master'

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

@@ -177,8 +177,10 @@ public class UserServiceImpl implements IUserService {
 
     @Override
     public List<User> findAll() {
+        List<User> userList = new ArrayList<>();
         List<User> users = pasUserDao.findAll();
         for (User user : users) {
+            if(!user.getUsername().equals("root")){
                 List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
                 List<String> roleIds = new ArrayList<>();
                 for (UserRole userRole : userRoles) {
@@ -186,8 +188,10 @@ public class UserServiceImpl implements IUserService {
                 }
                 List<Role> roles = roleDao.findAllByIdIn(roleIds);
                 user.setRoles(roles);
+                userList.add(user);
             }
-        return users;
+        }
+        return userList;
     }
 
     @Override