增加输入可输入城市或城市编码

This commit is contained in:
mjt
2024-01-26 11:07:11 +08:00
parent 9adddbb21d
commit 889d8e5bc6
2 changed files with 3 additions and 3 deletions
@@ -13,7 +13,7 @@ public class AdministrativeDivisionDaoImpl extends MongoDaoImpl<AdministrativeDi
@Override @Override
public AdministrativeDivision findcityByCode(String code) { public AdministrativeDivision findcityByCode(String code) {
if (StringUtils.isBlank(code)) { if (StringUtils.isBlank(code)) {
return null; return new AdministrativeDivision();
} }
List<QueryParam> params = new ArrayList<QueryParam>(); List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code));
@@ -215,10 +215,10 @@ public class ComprehensiveQueryController {
} }
String cityStr = model.getCity(); String cityStr = model.getCity();
if (cityStr.matches("\\d+")) { if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) {
AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr);
String city = administrativeDivision.getCityShort(); String city = administrativeDivision.getCityShort();
if (administrativeDivision == null || StringUtils.isBlank(city)) { if (StringUtils.isBlank(city)) {
mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); mav.setModel(BasicModel.buildBadRequestModel("城市代码错误"));
return mav; return mav;
} }