客户导入

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -45,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 基础客户表 服务实现类
@@ -326,6 +327,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				|| ii.getClientName().equals(basicdataClient.getClientName()));
 
 			if(b){
+				List<BasicdataClientEntity> basicdataClientEntities = basicdataClients.stream().filter(ii -> ii.getClientCode().equals(basicdataClient.getClientCode())
+					|| ii.getClientName().equals(basicdataClient.getClientName())).collect(Collectors.toList());
+				log.info("###############basicdataClientEntities重复客户:{}",basicdataClientEntities);
 				throw new ServiceException("客户编码或客户名称已存在");
 			}
 //			Optional<DictBiz> first = dictBizs.stream().filter(ii -> ii.getDictValue().equals(i.getTypeService())).findFirst();
@@ -355,6 +359,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 						storeBusinessEntities.add(storeBusinessEntity);
 					}
 					//添加服务仓
+
 					if(ObjectUtils.isNotNull(i.getServeWarehouseName())){
 						BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity();
 						servicesEntity.setClientId(basicdataClient.getId());