修复商户同步数据报错

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMerchantServiceImpl.java

@@ -63,10 +63,14 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
                     merchant.setMerchantName(validFieldDataMap.get(field).toString());
                     break;
                 case "MerIdcardNo":
-                    merchant.setMerchantCard(validFieldDataMap.get(field).toString());
+                    if(validFieldDataMap.get(field) != null){
+                        merchant.setMerchantCard(validFieldDataMap.get(field).toString());
+                    }
                     break;
                 case "MerchantMobile":
-                    merchant.setMerchantPhone(validFieldDataMap.get(field).toString());
+                    if(validFieldDataMap.get(field) != null){
+                        merchant.setMerchantPhone(validFieldDataMap.get(field).toString());
+                    }
                     break;
                 case "BrandId":
                     merchant.setBrandId(Integer.valueOf(validFieldDataMap.get(field).toString()));