合并分支 'gwj' 到 'master'

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/note
+spring.data.mongodb.uri=mongodb://localhost:27017/notes
 # 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

@@ -102,7 +102,7 @@ public class UserManageServiceImpl implements UserManageService {
             pageResponse.setRows(userVos);
             pageResponse.setTotalCount(userList.size());
             return pageResponse;
-        }else if(totalPage==currentPage){
+        }else{
             List<User> users1 = userList.subList(start, userList.size());
             for (User user : users1) {
                 userVos.add(new UserVo(user));
@@ -110,8 +110,6 @@ public class UserManageServiceImpl implements UserManageService {
             pageResponse.setRows(userVos);
             pageResponse.setTotalCount(userList.size());
             return pageResponse;
-        }else{
-            return null;
         }
 
 //        List<User> users = new ArrayList<>();