diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index c50cb759e..3b64243d8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -83,7 +83,7 @@ public class CommercialController { if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "sell", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); - if(dtos.size()<5){ + if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); } } @@ -224,7 +224,7 @@ public class CommercialController { if (json.containsKey("case")) { List dtos = createBusiness((JSONArray) json.get("case"), "rent", ratio); mav.setModel(BasicModel.buildOKModel().setResult(dtos)); - if(dtos.size()<5){ + if(dtos!=null && dtos.size()<5){ BasicModel.markNoDataRequest(); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index dd3b08d49..68a0fca8f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -777,12 +777,12 @@ public class OfficeController { Map districtPriceMap = new HashMap(); List createBusiness = createBusiness(evaluation.getSeawater(), "office_rent", district, ratio); mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); - if(createBusiness.size()<5){ + if(createBusiness!=null && createBusiness.size()<5){ BasicModel.markNoDataRequest(); } return mav; } - mav.setModel(BasicModel.buildOKModel().markNoData()); +// mav.setModel(BasicModel.buildOKModel().markNoData()); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index fefd8c28c..e96f24d70 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -494,12 +494,12 @@ public class OfficeSellController { List createBusiness = createBusiness(evaluation.getSeawater(), "office_sell", district, ratio); // districtPriceMap.put("result", createBusiness); mav.setModel(BasicModel.buildOKModel().setResult(createBusiness)); - if(createBusiness.size()<5){ + if(createBusiness !=null && createBusiness.size()<5){ BasicModel.markNoDataRequest(); } return mav; } - mav.setModel(BasicModel.buildOKModel().markNoData()); +// mav.setModel(BasicModel.buildOKModel().markNoData()); return mav; } 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 68c9cb515..f3e7ea974 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 @@ -6378,7 +6378,7 @@ public class PropertyController { caseDtos = caseDtos.subList(0, caseDtos.size()-1); } mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); - if(caseDtos.size()<5){ + if(caseDtos!=null && caseDtos.size()<5){ BasicModel.markNoDataRequest(); } return mav; @@ -6574,7 +6574,7 @@ public class PropertyController { caseDtos = caseDtos.subList(0, caseDtos.size()-1); } mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); - if(caseDtos.size()<5){ + if(caseDtos!=null && caseDtos.size()<5){ BasicModel.markNoDataRequest(); } return mav;