From 937f904f03724173fda6796f5f4bd13cf0bff454 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 10 Jun 2023 09:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RegionServiceImpl.java       | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
index 52a0718d..87fcc244 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
@@ -150,34 +150,37 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
 			Set<RegionAllVO> lis = new HashSet<>();
 			v.forEach(it ->{
-				RegionAllVO shi = new RegionAllVO();
-				shi.setValue(it.getCityCode());
-				shi.setLabel(it.getCityName());
-				lis.add(shi);
-				List<RegionAllVO> voList = new ArrayList<>();
-				RegionAllVO qu = new RegionAllVO();
-				qu.setValue(it.getDistrictCode());
-				qu.setLabel(it.getDistrictName());
-				voList.add(qu);
-				if(m.size() < 1){
-					//没有数据 添加市 区数据
-
-					m.put(it.getCityCode(),voList);
-				}else{
-					//有数据 判断是不是同一个市
-					List<RegionAllVO> voList2 = m.get(it.getCityCode());
-					if(ObjectUtils.isNotNull(voList2)){
-						//有一样的数据
-						List<RegionAllVO> voList1 = m.get(it.getCityCode());
-						voList1.add(qu);
-						m.put(it.getCityCode(),voList1);
-					}else{
-						//没有
-						shi.setValue(it.getCityCode());
-						shi.setLabel(it.getCityName());
+				if(ObjectUtils.isNotNull(it.getCityCode())){
+					RegionAllVO shi = new RegionAllVO();
+					shi.setValue(it.getCityCode());
+					shi.setLabel(it.getCityName());
+					lis.add(shi);
+					List<RegionAllVO> voList = new ArrayList<>();
+					RegionAllVO qu = new RegionAllVO();
+					qu.setValue(it.getDistrictCode());
+					qu.setLabel(it.getDistrictName());
+					voList.add(qu);
+					if(m.size() < 1){
+						//没有数据 添加市 区数据
+
 						m.put(it.getCityCode(),voList);
+					}else{
+						//有数据 判断是不是同一个市
+						List<RegionAllVO> voList2 = m.get(it.getCityCode());
+						if(ObjectUtils.isNotNull(voList2)){
+							//有一样的数据
+							List<RegionAllVO> voList1 = m.get(it.getCityCode());
+							voList1.add(qu);
+							m.put(it.getCityCode(),voList1);
+						}else{
+							//没有
+							shi.setValue(it.getCityCode());
+							shi.setLabel(it.getCityName());
+							m.put(it.getCityCode(),voList);
+						}
 					}
 				}
+
 			});
 			//有市对区的数据
 			lis.forEach(i ->{