From 4fabe349cd5f54bc529ed9f28ee49af0f7daf744 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 14 Feb 2020 17:04:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20summary=E4=B8=8B=E8=BD=BD20=E6=9D=A1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../manage/tradelog/core/impls/TradeLogServiceImpl.java       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ae702621..52844b850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.34</version>
+    <version>1.3.35</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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<JSONObject> 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<JSONObject> 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<JSONObject> childLogs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc")));
+                    PageList<JSONObject> 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);
                     }