From 797ea1d27f937d2974b6e2b71b1e26131186be6a Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 31 Jul 2025 16:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E9=93=B6=E8=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-=E5=8E=BF=E6=94=BF=E5=BA=9C=E4=B8=8E=E5=BC=80?= =?UTF-8?q?=E5=8C=BA=E4=B8=8D=E8=83=BD=E5=85=B1=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index b2a850189..f371a44dd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -560,12 +560,18 @@ public class AddrSvcController { //我们的结果 JSONObject result = json.getJSONObject("result"); //我们省级及以上有开发区,直接用我们的结果 - if (result.containsKey("devDistrictName")) { + if (result.containsKey("devDistrictName") && StringUtils.isNotBlank(result.get("devDistrictName").toString())) { +// basicModel.setResult(result); + if(result.containsKey("countyGov") && StringUtils.isNotBlank(result.get("countyGov").toString())){ + result.put("countyGov",""); + } + } + basicModel.setResult(result); + //齐梁现在无法调用 + /*else if (!"2".equals(type)) { // 对私的不用齐梁 basicModel.setResult(result); - - } else if (!"2".equals(type)) { // 对私的不用齐梁 - basicModel.setResult(result); - } else { + } + else { try { //如果是江苏省或者浙江省 调用齐梁的结果 if (result.containsKey("province") && ("中国".equals(result.getString("province")))) { @@ -615,7 +621,7 @@ public class AddrSvcController { basicModel.setResult(result); } - } + }*/ } mav.setModel(basicModel);