From 53305f191901b1067e8676502b6b59e7fc8fe872 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 22 Mar 2023 13:38:04 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E5=A4=8D=E8=A1=8C=E6=94=BF?= =?UTF-8?q?=E5=8C=BA=E5=88=92=E5=B8=82=E7=BA=A7=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/cache/RegionCache.java | 1 + .../system/service/impl/RegionServiceImpl.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java index 5f0990fc..9f65c352 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java @@ -30,6 +30,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; * @author Chill */ public class RegionCache { + public static final String MAIN_CODE = "00"; public static final int PROVINCE_LEVEL = 1; public static final int CITY_LEVEL = 2; public static final int DISTRICT_LEVEL = 3; 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 6fc8f7d6..d5188967 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 @@ -23,6 +23,7 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringPool; +import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.entity.Region; import org.springblade.system.excel.RegionExcel; import org.springblade.system.mapper.RegionMapper; @@ -47,6 +48,16 @@ public class RegionServiceImpl extends ServiceImpl impleme @Override public boolean submit(Region region) { + // 设置市级编号格式 + String regionCode = region.getCode(); + String regionParentCode = region.getParentCode(); + if (regionCode.startsWith(MAIN_CODE)) { + region.setCode(StringUtil.removePrefix(regionCode, MAIN_CODE)); + } + if (regionParentCode.startsWith(MAIN_CODE)) { + region.setParentCode(StringUtil.removePrefix(regionParentCode, MAIN_CODE)); + } + // 查询是否已存在 Long cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(Region::getCode, region.getCode())); if (cnt > 0L) { return this.updateById(region);