From fbcca3a69be8c331dac3df915ff6f4b01e0baf82 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Feb 2020 10:19:35 +0800
Subject: [PATCH] fix transflow clientIds

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

diff --git a/pom.xml b/pom.xml
index 7b633f425..33f4c41a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.41</version>
+    <version>1.3.42</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.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 1891adc9d..49d0d1271 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
@@ -1689,7 +1689,7 @@ public class TradeLogServiceImpl implements TradeLogService {
                 String[] clientIds = query.getClient_ids();
                 List<String> clientIdList = new ArrayList<>();
                 clientIdList.add("ALL");
-                if (clientIds.length >= 2) {
+                if (clientIds!=null && clientIds.length >= 2) {
                     clientIdList.addAll(Arrays.asList(clientIds));
                 }
                 HSSFSheet sheet = null;