null 修改

This commit is contained in:
2026-01-16 16:37:30 +08:00
parent 610543644d
commit 6603404510
4 changed files with 8 additions and 8 deletions
@@ -83,7 +83,7 @@ public class CommercialController {
if (json.containsKey("case")) {
List<BusinessCaseDto> 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<BusinessCaseDto> 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();
}
}
@@ -777,12 +777,12 @@ public class OfficeController {
Map<String, Object> districtPriceMap = new HashMap<String, Object>();
List<BusinessCaseDto> 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;
}
@@ -494,12 +494,12 @@ public class OfficeSellController {
List<BusinessCaseDto> 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;
}
@@ -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;