代码修改

notes-union/src/main/resources/application.properties

@@ -14,7 +14,7 @@ server.port=8289
 #server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/notes
+spring.data.mongodb.uri=mongodb://localhost:27017/note
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB

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

@@ -85,26 +85,35 @@ public class UserManageServiceImpl implements UserManageService {
 
         int currentPage = pageRequest.getCurrentPage();
         int pageSize = pageRequest.getPageSize();
-        int start = (currentPage-1)*pageSize+1;
+        int start = (currentPage-1)*pageSize;
         int end = start+pageSize;
-        if(userList.size()>=end){
-            List<User> users1 = userList.subList(start-1, end-1);
+        int totalPage = 0;
+        if((userList.size()/pageSize)==0){
+            totalPage = (userList.size())/pageSize;
+        }else{
+            totalPage = (userList.size())/pageSize + 1;
+        }
+
+        if(totalPage>currentPage){
+            List<User> users1 = userList.subList(start, end);
             for (User user : users1) {
                 userVos.add(new UserVo(user));
             }
             pageResponse.setRows(userVos);
             pageResponse.setTotalCount(userList.size());
             return pageResponse;
-        }else if(start<=userList.size()&&end>=userList.size()){
-            List<User> users1 = userList.subList(start-1, userList.size()-1);
+        }else if(totalPage==currentPage){
+            List<User> users1 = userList.subList(start, userList.size());
             for (User user : users1) {
                 userVos.add(new UserVo(user));
             }
             pageResponse.setRows(userVos);
             pageResponse.setTotalCount(userList.size());
             return pageResponse;
-        }
+        }else{
             return null;
+        }
+
 //        List<User> users = new ArrayList<>();
 //        PageResponse<UserVo> pageResponse = new PageResponse<>();
 //        pageResponse.setCurrentPage(pageRequest.getCurrentPage());