Browse Source

修复行政区划市级新增报错问题

test
smallchill 2 years ago
parent
commit
53305f1919
  1. 1
      blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java
  2. 11
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java

1
blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java vendored

@ -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;

11
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<RegionMapper, Region> 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.<Region>query().lambda().eq(Region::getCode, region.getCode()));
if (cnt > 0L) {
return this.updateById(region);

Loading…
Cancel
Save