From f28c0f940380a8777346a55b4883bd4b70de2e93 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 14 Feb 2025 10:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=95=86=E5=9F=8E=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BasicdataClientServiceImpl.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
index 0a84d7c41..dd34a8e91 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
+++ b/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("存在相同的数据");
 		}