diff --git a/src/com/engine/salary/entity/siarchives/param/SIArchiveBaseHistoryListParam.java b/src/com/engine/salary/entity/siarchives/param/SIArchiveBaseHistoryListParam.java index 39ad81109..efa7b7bc1 100644 --- a/src/com/engine/salary/entity/siarchives/param/SIArchiveBaseHistoryListParam.java +++ b/src/com/engine/salary/entity/siarchives/param/SIArchiveBaseHistoryListParam.java @@ -23,6 +23,6 @@ public class SIArchiveBaseHistoryListParam { private Long operator; private Long paymentOrganization; - private int pageNum; + private int current; private int pageSize; } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 4ad9d506e..59b4d8e48 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -1148,7 +1148,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService List targetHistory = adjustHistoryDTOS.stream() .filter(f -> f.getWelfareType().equals(param.getWelfareTypeEnum().getValue())).collect(Collectors.toList()); - PageInfo listPage = SalaryPageUtil.buildPage(param.getPageNum(), param.getPageSize(), + PageInfo listPage = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), targetHistory , InsuranceArchivesBaseHistoryDTO.class); return listPage; @@ -1159,7 +1159,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService List adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); - PageInfo listPage = SalaryPageUtil.buildPage(param.getPageNum(), param.getPageSize(), + PageInfo listPage = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), adjustHistoryDTOS , InsuranceArchivesBaseHistoryDTO.class); return listPage;