代码修改

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

@@ -308,6 +308,19 @@ public class UserServiceImpl implements IUserService {
         if(all!=null){
             for (User user : all) {
                 List<String> departmentIds = user.getDepartmentIds();
+
+                if(departmentIds!=null){
+                    for (String departId : departmentIds) {
+                        if(departmentList.contains(departId)){
+                            users.add(user);
+                            break;
+                        }
+                    }
+                }
+
+            }
+        }
+        for (User user : users) {
             List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
             List<String> roleIds = new ArrayList<>();
             if(userRoles!=null){
@@ -328,17 +341,6 @@ public class UserServiceImpl implements IUserService {
                 }
             }
             user.setRoles(roles);
-
-                if(departmentIds!=null){
-                    for (String departId : departmentIds) {
-                        if(departmentList.contains(departId)){
-                            users.add(user);
-                            break;
-                        }
-                    }
-                }
-
-            }
         }
         return users;