From 0bafa6aa253c9ef6f5cb24e9a24c5282860e4c59 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 30 三月 2026 11:44:37 +0800
Subject: [PATCH] 新增线上配置
---
tms/src/main/java/com/ruoyi/tms/controller/TmsRegionController.java | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsRegionController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsRegionController.java
index 8b47acd..c12115f 100644
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsRegionController.java
+++ b/tms/src/main/java/com/ruoyi/tms/controller/TmsRegionController.java
@@ -120,33 +120,47 @@
);
if (tmsRegion != null){
hasMap.put("provinceCode",tmsRegion.getRegionCode());
- }
- }
- if (StringUtils.isNotEmpty(addressVo.getCity())){
- TmsRegion tmsRegion = tmsRegionService.getBaseMapper().selectOne(new LambdaUpdateWrapper<>(TmsRegion.class)
- .eq(TmsRegion::getRegionName, addressVo.getCity())
- .last("limit 1")
- );
- if (tmsRegion != null){
- hasMap.put("cityCode",tmsRegion.getRegionCode());
- }
- }
- if (StringUtils.isNotEmpty(addressVo.getDistrict())){
- TmsRegion tmsRegion = tmsRegionService.getBaseMapper().selectOne(new LambdaUpdateWrapper<>(TmsRegion.class)
- .eq(TmsRegion::getRegionName, addressVo.getDistrict())
- .last("limit 1")
- );
- if (tmsRegion != null){
- hasMap.put("districtCode",tmsRegion.getRegionCode());
- }
- }
- if (StringUtils.isNotEmpty(addressVo.getTownship())){
- TmsRegion tmsRegion = tmsRegionService.getBaseMapper().selectOne(new LambdaUpdateWrapper<>(TmsRegion.class)
- .eq(TmsRegion::getRegionName, addressVo.getTownship())
- .last("limit 1")
- );
- if (tmsRegion != null){
- hasMap.put("townshipCode",tmsRegion.getRegionCode());
+ if (StringUtils.isNotEmpty(addressVo.getCity())){
+ TmsRegion tmsRegion2 = tmsRegionService.getBaseMapper().selectOne(new LambdaUpdateWrapper<>(TmsRegion.class)
+ .eq(TmsRegion::getRegionName, addressVo.getCity())
+ .eq(TmsRegion::getParentRegionCode, tmsRegion.getRegionCode())
+ .last("limit 1")
+ );
+ if (tmsRegion2 != null){
+ hasMap.put("cityCode",tmsRegion2.getRegionCode());
+
+ if (!StringUtils.isNotEmpty(addressVo.getDistrict())){
+ // 娣诲姞鐗规畩澶勭悊
+ if ("涓北甯�".equals(addressVo.getCity())){
+ addressVo.setDistrict("涓北甯�");
+ }else if ("涓滆帪甯�".equals(addressVo.getCity())){
+ addressVo.setDistrict("涓滆帪甯�");
+ }
+ }
+ if (StringUtils.isNotEmpty(addressVo.getDistrict())){
+ TmsRegion tmsRegion3= tmsRegionService.getBaseMapper().selectOne(new LambdaUpdateWrapper<>(TmsRegion.class)
+ .eq(TmsRegion::getRegionName, addressVo.getDistrict())
+ .eq(TmsRegion::getParentRegionCode, tmsRegion2.getRegionCode())
+ .last("limit 1")
+ );
+ if (tmsRegion3 != null){
+ hasMap.put("districtCode",tmsRegion3.getRegionCode());
+
+ if (StringUtils.isNotEmpty(addressVo.getTownship())){
+ TmsRegion tmsRegion4 = tmsRegionService.getBaseMapper().selectOne(new LambdaUpdateWrapper<>(TmsRegion.class)
+ .eq(TmsRegion::getRegionName, addressVo.getTownship())
+ .eq(TmsRegion::getParentRegionCode, tmsRegion3.getRegionCode())
+ .last("limit 1")
+ );
+ if (tmsRegion4 != null){
+ hasMap.put("townshipCode",tmsRegion4.getRegionCode());
+ }
+ }
+
+ }
+ }
+ }
+ }
}
}
return AjaxResult.success(hasMap);
--
Gitblit v1.8.0