From faa02fa3487f765a03d3fc7e63c9be57ddd42c9e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 11:06:45 +0800
Subject: [PATCH] 应付接口

---
 tms/src/main/java/com/ruoyi/tms/controller/TmsRegionController.java |   62 +++++++++++++++++-------------
 1 files changed, 35 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..c9aa57e 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,41 @@
             );
             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())){
+                            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