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 1088d4648..40afe3fe6 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 @@ -228,7 +228,7 @@ public class ComprehensiveQueryController { String cityStr = model.getCity(); if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) { AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); - if(administrativeDivision == null){ + if (administrativeDivision == null) { mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); return mav; } @@ -289,11 +289,11 @@ public class ComprehensiveQueryController { // return mav; // } JSONObject result = matchResponse.getJSONObject("result"); - if(!result.containsKey("id")){ + if (!result.containsKey("id")) { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); return mav; } - String id = matchResponse.getJSONObject("result") .getString("id"); + String id = matchResponse.getJSONObject("result").getString("id"); District district = districtService.findById(id); if (district == null) { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); @@ -419,9 +419,11 @@ public class ComprehensiveQueryController { if (facilitys != null) { List hospitalList = facilitys.getHospital(); List hospitals = new ArrayList(); - for (String hospital : hospitalList) { - if (hospital.endsWith("医院")) { - hospitals.add(hospital); + if (hospitalList != null && !hospitalList.isEmpty()) { + for (String hospital : hospitalList) { + if (hospital.endsWith("医院")) { + hospitals.add(hospital); + } } } facilitys.setHospital(hospitals); @@ -753,7 +755,7 @@ public class ComprehensiveQueryController { districtPriceMap.put("name", district.getName()); // 估值中已经取过评估2B价格,且经过系数调整,不能在覆盖 districtPriceMap.put("avgPrice", evaluation.getAvgPrice()); - Long totalPrice = new BigDecimal((Integer)districtPriceMap.get("avgPrice")).multiply(new BigDecimal(evaluation.getArea())).longValue(); + Long totalPrice = new BigDecimal((Integer) districtPriceMap.get("avgPrice")).multiply(new BigDecimal(evaluation.getArea())).longValue(); districtPriceMap.put("totalPrice", totalPrice); if (model.getScope() == EVALUATE_SHOW_DETAIL) {