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 c0f3d23ac..dbbad6549 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 @@ -435,11 +435,8 @@ public class AddrSvcController { if (json.containsKey("result")) { //我们的结果 JSONObject result = json.getJSONObject("result"); - // 如果是无效信息,则用我们的 - if (result.containsKey("addrVerify") && !"地址有效".equals(result.getString("addrVerify"))) { - basicModel.setResult(result); - }//我们省级及以上有开发区,直接用我们的结果 - else if (result.containsKey("devDistrictName")) { + //我们省级及以上有开发区,直接用我们的结果 + if (result.containsKey("devDistrictName")) { basicModel.setResult(result); } else { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java index 06d3ef504..dfa009521 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GdBankController.java @@ -95,8 +95,8 @@ public class GdBankController { } else if (("否").equals(result.get("countyLevelCity"))) { result.put("prefectureLevelCity", "是"); } - // 如果是无效信息,则用我们的 - if (result.containsKey("addrVerify") && !"地址有效".equals(result.getString("addrVerify"))) { + // 如果是无效信息或者没有行政区划,则用我们的 + if (result.containsKey("addrVerify") && ("无效".equals(result.getString("addrVerify")) || "没有行政区划".equals(result.getString("addrVerify")))) { basicModel.setResult(result); //我们省级及以上有开发区,直接用我们的结果 } else if (result.containsKey("devDistrictName")) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 875390efc..2e741bfef 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2539,8 +2539,15 @@ public class PropertyController { districtNames.add(districtTemp.getName()); } } + + // districtNames 不包含 主小区名,加进去 + if (!districtNames.contains(masterDistrictName)){ + districtNames.add(masterDistrictName); + } + } } + // List dealPrices = new ArrayList(); // 将主名与映射别名查得成交加入 存在不能查出最新成交问题 // for (String name : districtNames) {