From f0f55c67a6b01c94b342673c6328933723650d3e Mon Sep 17 00:00:00 2001 From: majintao Date: Wed, 2 Apr 2025 15:40:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E6=89=80=E8=A1=8C=E6=94=BF?= =?UTF-8?q?=E5=8C=BA=E5=88=92=E6=94=B9=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/ComprehensiveQueryController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index f2037adbc..e0d0fddff 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -235,14 +235,14 @@ public class ComprehensiveQueryController { String cityStr = model.getCity(); String districtStr = model.getDistrict(); - String cityShort = ""; + String cityShort = model.getCity(); if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+") && StringUtils.isBlank(districtStr)) { cityShort = administrativeMappingService.findCityShortByCityCode(cityStr); if (StringUtils.isBlank(cityShort)) { mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); return mav; } - } else if (districtStr.matches("\\d+")) { + } else if (StringUtils.isNotBlank(districtStr) && districtStr.matches("\\d+")) { cityShort = administrativeMappingService.findDistrictShortByDistrictCode(cityStr, districtStr); if (StringUtils.isBlank(cityShort)) { mav.setModel(BasicModel.buildBadRequestModel("区县代码错误"));