From 889d8e5bc6787772d9cc8affce7541c1dc62ff53 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Fri, 26 Jan 2024 11:07:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=85=A5=E5=8F=AF?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=9F=8E=E5=B8=82=E6=88=96=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java | 2 +- .../open/controllers/ComprehensiveQueryController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; }