合并分支 'gwj' 到 'master'

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

@@ -79,18 +79,18 @@ public class UserManageServiceImpl implements UserManageService {
         }
         int currentPage = pageRequest.getCurrentPage();
         int pageSize = pageRequest.getPageSize();
-        int start = (currentPage-1)*pageSize;
+        int start = (currentPage-1)*pageSize+1;
         int end = start+pageSize;
-        if(end>=userList.size()&&start<userList.size()){
-            List<User> users1 = userList.subList(start, userList.size() - 1);
+        if(userList.size()>=end){
+            List<User> users1 = userList.subList(start-1, end-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);
+        }else if(start<=userList.size()&&end>=userList.size()){
+            List<User> users1 = userList.subList(start-1, userList.size()-1);
             for (User user : users1) {
                 userVos.add(new UserVo(user));
             }