diff --git a/pom.xml b/pom.xml index 2ae702621..52844b850 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.34 + 1.3.35 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index cbff91bbc..1891adc9d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -991,14 +991,14 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject params = query.toParams(timezone); params.put("client_id", clientId); PageList logs = transactionMapper.listSettlementLog(params, - new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc"))); + new PageBounds(1, 100000000, Order.formString("clearing_time.desc"))); try (HSSFWorkbook workbook = new HSSFWorkbook()) { if (query.getClient_ids() == null) { addSheet(0, workbook, client, logs); List childs = clientMapper.listChildClients(client.getIntValue("client_id")); for (int i = 0; i < childs.size(); i++) { params.put("client_id", childs.get(i).getInteger("client_id")); - PageList childLogs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc"))); + PageList childLogs = transactionMapper.listSettlementLog(params, new PageBounds(1, 100000000, Order.formString("clearing_time.desc"))); if (childLogs.size() > 0) { addSheet(i + 1, workbook, childs.get(i), childLogs); }