diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java index 43e6959b0..646b65331 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java @@ -242,9 +242,12 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { district = districtService.findOneByKey(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); // List districts = districtService.findNearestDistrict(district, 1000, 5); List districts = districtService.doFindNearestHasHouseDistrict(district, 1000, 5); - List arroundNnames = new ArrayList(); - List arroundKeys = new ArrayList(); + for (District d : districts) { + + List arroundNnames = new ArrayList(); + List arroundKeys = new ArrayList(); + d = districtService.findById(d.getId()); if(district.getName().equals(d.getName())){ continue; @@ -265,17 +268,19 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { } } } - } - List nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); - for (SampleWrapper sample : nearlySample) { - sample.setProperty(district); + List nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + + for (SampleWrapper sample : nearlySample) { + sample.setProperty(district); + } + sortForSample(nearlySample, target); + querySamples.addAll(nearlySample); + if (querySamples.size() > max) { + break; + } } - sortForSample(nearlySample, target); - querySamples.addAll(nearlySample); -// if (querySamples.size() > max) { -// break; -// } + } if (querySamples.isEmpty()) { SampleWrapper standardSample = createStandardSample(queryBean);