车辆信息导入接口修复

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

@@ -167,7 +167,6 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 		String method = "#############BasicdataVehicleServiceImpl.importDriverArtery";
 		log.info("车辆模板导入信息>>>>",data);
 		try {
-			boolean flag = false;
 			List<BasicdataDrivermiddleEntity>drivermiddleEntities = new ArrayList<>();
 			//对导入数据进行处理
 			for (BasicdataVehicleImportExcel datum : data) {
@@ -193,12 +192,18 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				//查看是否填写了电话号码，如果填写了电话号码进行校验号码是否有效
 				if (Func.isNotEmpty(datum.getVehicleUnitPhone())){
 					//车辆所属单位电话校验
-					 flag = PhoneCheckUtil.checkPhone(datum.getVehicleUnitPhone());
+					boolean a = PhoneCheckUtil.checkPhone(datum.getVehicleUnitPhone());
+					 if (a){
+						throw new ServiceException("请填写正确手机号码！");
+					 }
 				}
 
 				if (Func.isNotEmpty(datum.getVehicleOwnerPhone())){
 					//车辆所属人电话校验
-					 flag = PhoneCheckUtil.checkPhone(datum.getVehicleOwnerPhone());
+					boolean b =  PhoneCheckUtil.checkPhone(datum.getVehicleOwnerPhone());
+					if (b){
+						throw new ServiceException("请填写正确手机号码！");
+					}
 					 //进行关系司机绑定
 					//查询是否存在司机
 					if (!StringUtil.isBlank(datum.getVehicleOwner())){
@@ -213,9 +218,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 					}
 
 				}
-				if (!flag){
-					throw new ServiceException("请填写正确手机号码！");
-				}
+
 
 				if (Func.isNotEmpty(datum.getCarrierName())){
 					//存在承运商,进行承运商的校验