diff --git a/pom.xml b/pom.xml index 23f1abd0a..ee1a0f9a6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.22 + 1.2.23 UTF-8 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 aa293a4e3..c17fbe150 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 mostUseAddressByCustomer = orderAnalysisMapper.mostUseAddressByCustomer(params); for (JSONObject address : mostUseAddressByCustomer) { String city = lookupService.getLocation(address.getString("customer_ip")).city; - if (topAddress.size() < 3 && !topAddress.contains(city) && StringUtils.isNotBlank(city)) { + if (topAddress.size() < 3 && !topAddress.contains(city) && StringUtils.isNotBlank(city) && city != null) { topAddress.add(city); } }