From 3dc36c5cb4fb364482ae2528d336fa7b2145fed7 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Tue, 12 Nov 2019 13:57:13 +0800
Subject: [PATCH] =?UTF-8?q?firstTag=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eladmin-system/pom.xml                                     | 7 +++++++
 .../wms/bd/service/impl/CustomerInfoServiceImpl.java       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
index 62691647..5f03128c 100644
--- a/eladmin-system/pom.xml
+++ b/eladmin-system/pom.xml
@@ -47,6 +47,13 @@
             <artifactId>quartz</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/CustomerInfoServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/CustomerInfoServiceImpl.java
index 6ab3b267..40d923ac 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/CustomerInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/CustomerInfoServiceImpl.java
@@ -86,7 +86,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
                             List<CustomerContact> customerContactList = new Gson().fromJson(customerContactJsonStr,new TypeToken<ArrayList<CustomerContact>>() {}.getType());
                             if(!CollectionUtils.isEmpty(customerContactList)){
                                 for(CustomerContact customerContact : customerContactList){
-                                    if(customerContact.getFirstTag() == 1){
+                                    if(!StringUtils.isEmpty(customerContact.getFirstTag()) && customerContact.getFirstTag() == 1){
                                         customerInfoDTO.setFirstContactMobile(customerContact.getMobile());
                                         customerInfoDTO.setFirstContactName(customerContact.getName());
                                     }