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 @@ quartz + + com.google.code.gson + gson + 2.8.6 + + + 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 customerContactList = new Gson().fromJson(customerContactJsonStr,new TypeToken>() {}.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()); }