第五次提交

src/main/java/com/example/tyweekly/service/impl/WeeklyFileServiceImpl.java

@@ -81,7 +81,7 @@ public class WeeklyFileServiceImpl implements WeeklyFileService {
     @Override
     public Page<WeeklyUser> findAllWeekly(WeeklyCondition weeklyCondition) {
         //根据传入的数据，进行分页数据查询
-        Pageable of1 = PageRequest.of(weeklyCondition.getPage(), weeklyCondition.getPageSize());
+        Pageable of1 = PageRequest.of(weeklyCondition.getPage()-1, weeklyCondition.getPageSize());
         Map<String, WeeklyUser> userMap = weeklyUserDao.findAll().stream().collect(Collectors.toMap(WeeklyUser::getUserName, Function.identity()));
         List<String> userNames = new ArrayList<>(userMap.keySet());
         //动态查询构造器
@@ -133,7 +133,8 @@ public class WeeklyFileServiceImpl implements WeeklyFileService {
             }
         }
         //做物理分页
-        Page<WeeklyUser> perPage = PageUtil.getPerPage(of1.getPageNumber() - 1, of1.getPageSize(), userList1, of1);
+        Page<WeeklyUser> perPage = PageUtil.getPerPage(of1.getPageNumber(), of1.getPageSize(), userList1, of1);
+        long totalElements = perPage.getTotalElements();
         return perPage;
     }
 

src/main/resources/application.properties

@@ -10,8 +10,8 @@ spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 
-#file.path=/root/projects/weekly/download/ty-weekly.zip
-file.path=C:/Intel/ty-weekly.zip
-
-file.path1=C:/Intel/
-#file.path1=/root/projects/weekly/save/
+file.path=/root/projects/weekly/download/ty-weekly.zip
+#file.path=C:/Intel/ty-weekly.zip
+#
+#file.path1=C:/Intel/
+file.path1=/root/projects/weekly/save/