From da9951c13365ccfbd8eac5937a4227d5c66aea19 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 26 Sep 2019 18:30:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=9F=8E=E5=B8=82=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../manage/analysis/core/impls/CustomersAnalysisServiceImp.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d5743cdb..23f1abd0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.21</version>
+    <version>1.2.22</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
index 28c16d48f..aa293a4e3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
@@ -389,7 +389,7 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService {
         List<JSONObject> mostUseAddressByCustomer = orderAnalysisMapper.mostUseAddressByCustomer(params);
         for (JSONObject address : mostUseAddressByCustomer) {
             String city = lookupService.getLocation(address.getString("customer_ip")).city;
-            if (topAddress.size() < 3 && !topAddress.contains(city)) {
+            if (topAddress.size() < 3 && !topAddress.contains(city) && StringUtils.isNotBlank(city)) {
                 topAddress.add(city);
             }
         }