考勤

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

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