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 44defb7b8..852bbd508 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 @@ -576,13 +576,21 @@ public class AddrSvcController { if (json.containsKey("result")) { //我们的结果 JSONObject result = json.getJSONObject("result"); - //我们省级及以上有开发区,直接用我们的结果 - if (result.containsKey("devDistrictName")) { - basicModel.setResult(result); + 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); + + //我们省级及以上有开发区,直接用我们的结果 + /*if (result.containsKey("devDistrictName")) { + basicModel.setResult(result); } else if (!"2".equals(type)) { // 对私的不用齐梁 basicModel.setResult(result); - } else { + }else { try { //如果是江苏省或者浙江省 调用齐梁的结果 if (result.containsKey("province") && ("中国".equals(result.getString("province")))) { @@ -632,7 +640,7 @@ public class AddrSvcController { basicModel.setResult(result); } - } + }*/ } mav.setModel(basicModel);