diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java index aafebbc75..a737f3157 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java @@ -13,7 +13,7 @@ public class AdministrativeDivisionDaoImpl extends MongoDaoImpl params = new ArrayList(); params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); 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 5c40cf9d3..1106483b6 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 @@ -215,10 +215,10 @@ public class ComprehensiveQueryController { } String cityStr = model.getCity(); - if (cityStr.matches("\\d+")) { + if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) { AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); String city = administrativeDivision.getCityShort(); - if (administrativeDivision == null || StringUtils.isBlank(city)) { + if (StringUtils.isBlank(city)) { mav.setModel(BasicModel.buildBadRequestModel("³ÇÊдúÂë´íÎó")); return mav; }