diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 080f08f51..66bc99790 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -1237,7 +1237,7 @@ public class DistrictController { */ public Object doAddAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); - List districts = districtService.findByKey(district.getCity(), district.getRegion(), + List districts = districtService.findAllByNameAndCat(district.getCity(), district.getRegion(), district.getName(), "district"); if (!districts.isEmpty() && districts.get(0).getName().equals(district.getName())) { model.setMsg("小区名已存在!"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java index 04e5d5de2..e00652926 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java @@ -466,6 +466,8 @@ public interface DistrictService extends ModeService { */ public List findByKey(String city, String region, String name, String cat); + public List findAllByNameAndCat(String city, String region, String name, String cat); + /** * 查找周边最相似的楼盘 * 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 dd625b469..099443762 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 @@ -2191,6 +2191,20 @@ public class DistrictServiceImpl implements DistrictService { return districtDao.findAllByParams(params); } + @Override + public List findAllByNameAndCat(String city, String region, String name, String cat) { + List params = new ArrayList(5); + params.add(new QueryParam("city", city)); + if (StringUtils.isNotBlank(region)) { + params.add(new QueryParam("region", region)); + } + if (StringUtils.isNotBlank(name)) { + params.add(new QueryParam("name", name)); + } + params.add(new QueryParam("category", cat)); + return districtDao.findAllByParams(params); + } + @Override public District findOneByKey(DistrictKey districtKey, String cat) { List districts = findByKey(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(),