合并分支 'gwj' 到 'master'

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -69,14 +69,20 @@ public class UserManageServiceImpl implements UserManageService {
         String deId = pageRequest.getDeId();
         List<User> users = pasUserDao.findAll();
         List<User> userList = new ArrayList<>();
-        for (User user : users) {
-            List<String> departmentIds = user.getDepartmentIds();
-            for (String departmentId : departmentIds) {
-                if(departmentId.equals(deId)){
-                    userList.add(user);
+        if(users!=null){
+            for (User user : users) {
+                List<String> departmentIds = user.getDepartmentIds();
+                if(departmentIds!=null){
+                    for (String departmentId : departmentIds) {
+                        if(departmentId.equals(deId)){
+                            userList.add(user);
+                        }
+                    }
                 }
+
             }
         }
+
         int currentPage = pageRequest.getCurrentPage();
         int pageSize = pageRequest.getPageSize();
         int start = (currentPage-1)*pageSize+1;