1、入库

hx-customer/src/main/java/com/fjhx/customer/service/xiaoman/impl/XiaomanCustomerServiceImpl.java

@@ -157,6 +157,8 @@ public class XiaomanCustomerServiceImpl extends ServiceImpl<XiaomanCustomerMappe
                 .eq(StringUtils.isNotEmpty(vo.getName()), Customer::getName, vo.getName())
                 .or()
                 .eq(StringUtils.isNotEmpty(vo.getShortName()), Customer::getName, vo.getShortName())
+                .or()
+                .eq(Objects.nonNull(vo.getCompanyId()), Customer::getCompanyId, vo.getCompanyId())
                 .list();
 
         if (!list.isEmpty()){
@@ -218,11 +220,13 @@ public class XiaomanCustomerServiceImpl extends ServiceImpl<XiaomanCustomerMappe
                                 if (StringUtils.isNotEmpty(customerUser.getContactJson())){
                                     maps = JSON.parseArray(customerUser.getContactJson(), Map.class);
                                     for (Map map:maps){
-                                        if (!contact.getValue().equals(map.get("contactNo"))){
+                                        if (!contact.getValue().equals(map.get("contactNo")) && !contact.getType().equals(map.get("type"))){
                                             Map map1 = new HashMap();
                                             map1.put("type",contact.getType());
                                             map1.put("contactNo",contact.getValue());
                                             maps.add(map1);
+                                        }else {
+                                            System.out.println();
                                         }
                                     }
 
@@ -234,6 +238,7 @@ public class XiaomanCustomerServiceImpl extends ServiceImpl<XiaomanCustomerMappe
                                 }
 
                             }
+                            customerUser.setEmail(cus.getEmail());
                             customerUser.setContactJson(JSON.toJSONString(maps));
                             customerUserService.updateById(customerUser);
                         }else {