From 361f64034fa7cc9b8be11fea912f20111bcc58a9 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Mon, 27 Nov 2017 17:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=97=E5=8F=B7=E6=94=B9=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/controller/AreaCountController.java | 2 +- .../java/com/lyms/platform/operate/web/facade/AreaCountFacade.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 19a69c1..95c3d4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -32,7 +32,7 @@ public class AreaCountController extends BaseController { @RequestMapping(value = "/get/area/id", method = RequestMethod.GET) @ResponseBody - public BaseResponse getAreaId(@RequestParam String provinceName, @RequestParam String cityName, String areaName) { + public BaseResponse getAreaId(@RequestParam String provinceName, String cityName, String areaName) { return areaCountFacade.getAreaId(provinceName, cityName, areaName); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 48cfc25..9ebb7a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -873,6 +873,9 @@ public class AreaCountFacade { public BaseResponse getAreaId(String provinceName, String cityName, String areaName) { BasicConfig province = mongoTemplate.findOne(Query.query(Criteria.where("name").is(provinceName).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class); if (province != null) { + if(StringUtils.isEmpty(cityName)) { + return RespBuilder.buildSuccess(province.getId()); + } List citys = mongoTemplate.find(Query.query(Criteria.where("parentId").is(province.getId()).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class); for (BasicConfig city : citys) { if (cityName.equals(city.getName())) { -- 1.8.3.1