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("区县代码错误"));