三方商城导入

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

@@ -959,12 +959,18 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 												RegionAllVO regionAllVO2= collect2.get(0);
 												basicdataClient.setBladeRegionAreaId(regionAllVO2.getValue());
 												basicdataClient.setBladeRegionAreaName(regionAllVO2.getLabel());
+											}else {
+												throw new ServiceException(basicdataClient.getClientName()+"区/县地址错误");
 											}
 										}
 									}
+								}else {
+									throw new ServiceException(basicdataClient.getClientName()+"市地址错误");
 								}
 							}
 						}
+					}else {
+						throw new ServiceException(basicdataClient.getClientName()+"省地址错误");
 					}
 				}
 
@@ -1158,7 +1164,10 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			.map(BasicdataClientExcel::getClientName)
 			.distinct()
 			.count() != data.size();
-
+		boolean b = data.stream().anyMatch(a -> Objects.isNull(a.getBladeRegionProvinceName()) || Objects.isNull(a.getBladeRegionCityName()));
+		if (b) {
+			throw new CustomerException("请填写至市级地址");
+		}
 		if(hasDuplicates){
 			throw new CustomerException("存在相同的数据");
 		}