合并分支 'gwj' 到 'master'

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

@@ -64,6 +64,8 @@ public class UserManageServiceImpl implements UserManageService {
      */
     @Override
     public PageResponse<UserVo> findUserList(PageRequest pageRequest) {
+        List<UserVo> userVos = new ArrayList<>();
+        PageResponse<UserVo> pageResponse = new PageResponse();
         String deId = pageRequest.getDeId();
         List<User> users = pasUserDao.findAll();
         List<User> userList = new ArrayList<>();
@@ -75,7 +77,27 @@ public class UserManageServiceImpl implements UserManageService {
                 }
             }
         }
-
+        int currentPage = pageRequest.getCurrentPage();
+        int pageSize = pageRequest.getPageSize();
+        int start = (currentPage-1)*pageSize;
+        int end = start+pageSize;
+        if(end>=userList.size()&&start<userList.size()){
+            List<User> users1 = userList.subList(start, userList.size() - 1);
+            for (User user : users1) {
+                userVos.add(new UserVo(user));
+            }
+            pageResponse.setRows(userVos);
+            pageResponse.setTotalCount(userList.size());
+            return pageResponse;
+        }else if(userList.size()>=end){
+            List<User> users1 = userList.subList(start, userList.size() - 1);
+            for (User user : users1) {
+                userVos.add(new UserVo(user));
+            }
+            pageResponse.setRows(userVos);
+            pageResponse.setTotalCount(userList.size());
+            return pageResponse;
+        }
         return null;
 //        List<User> users = new ArrayList<>();
 //        PageResponse<UserVo> pageResponse = new PageResponse<>();