diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index 9628214e5..238c968db 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2457,8 +2457,8 @@ public class DistrictServiceImpl implements DistrictService { params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); List list = districtDao.findAllByParams(params, null, 0, limit * 2, new String[] { "city", "region", "name", "estateType2", "id" }); - if (list.size() == 0) { - return Collections.EMPTY_LIST; + if (list.isEmpty()) { + return Collections.emptyList(); } List ret = new ArrayList(); @@ -2467,8 +2467,8 @@ public class DistrictServiceImpl implements DistrictService { && district.getCity().equals(d.getCity())) { continue; } - if (d.getEstateType2() != null) { - if (d.getEstateType2().indexOf(district.getEstateType2()) > -1) { + if (d.getEstateType2() != null && district.getEstateType2() != null) { + if (d.getEstateType2().contains(district.getEstateType2())) { ret.add(d); } }