北交所行政区划改表

This commit is contained in:
majintao
2025-04-02 15:40:43 +08:00
parent f76d5cce48
commit f0f55c67a6
@@ -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("区县代码错误"));