From 8d35d3f140edec56c7d01eb777e5e44cd1cc336a Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 15 Oct 2024 15:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BEKey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/bkoff/controllers/DistrictController.java | 4 ++-- projects/fangjia-bkoff/src/main/webapp/district/add.ftl | 2 +- projects/fangjia-bkoff/src/main/webapp/district/edit.ftl | 2 +- projects/fangjia-bkoff/src/main/webapp/district/gaoDeMap.ftl | 2 +- .../fangjia-bkoff/src/main/webapp/district2/addOffice.ftl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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 66bc99790..e58c94365 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 @@ -1178,7 +1178,7 @@ public class DistrictController { JsonModel model = new JsonModel(); - List districts = districtService.findByKey(city, region, name, cat); + List districts = districtService.findAllByNameAndCat(city, region, name, cat); boolean exist = false; if (StringUtils.isNotBlank(id)) { for (District district2 : districts) { @@ -1237,7 +1237,7 @@ public class DistrictController { */ public Object doAddAction(DistrictModel model) throws UnsupportedEncodingException { District district = model.getDistrict(); - List districts = districtService.findAllByNameAndCat(district.getCity(), district.getRegion(), + List districts = districtService.findByKey(district.getCity(), district.getRegion(), district.getName(), "district"); if (!districts.isEmpty() && districts.get(0).getName().equals(district.getName())) { model.setMsg("小区名已存在!"); diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 49795b1c1..8623963f8 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -643,7 +643,7 @@ - + <#----> - + + - + <#---->