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 659fe43c9..1a233c2de 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 @@ -1185,6 +1185,36 @@ public class DistrictController { model.setJsonModel(data); return model; } + /** + * УÑéСÇøÃûÊǷñΪÆäËûСÇøµıðÃû + */ + public Object checkDistrictNameAction(@Param(name = "city") String city, @Param(name = "region") String region, + @Param(name = "name") String name, @Param(name = "cat") String cat, @Param(name = "id") String id) { + JsonModel model = new JsonModel(); + boolean exist = false; + + List list = new ArrayList(); + list.add(name); + List params = new ArrayList(); + params.add(new QueryParam("category", cat)); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("alias", name)); + + List ds = districtService.findAllByParams(params); + if (CollectionUtils.isNotEmpty(ds)) { + for (District d : ds) { + if (!d.getId().equals(id)) { + exist = true; + break; + } + } + } + Map data = new HashMap(); + data.put("exist", exist); + model.setJsonModel(data); + return model; + } /** * ±£´æÐÂÔöСÇø diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 1691f1e94..141a2e8ee 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -851,20 +851,20 @@ function add(){ } } - var mappingAlias = $("#mappingAlias").val(); - if(mappingAlias){ - var aliasArr=alias.toString().split("\n"); - var set=[]; - for(var i=0;i <#assign markMap = district.markMap! />
- + @@ -1116,20 +1116,18 @@ $(document).ready(function(){ alert('区域不能为空!'); return false; } - - /* + var dLat = $("#dLat").val(); if (dLat == '') { alert('经纬度不能为空!'); return false; } - + var dLng = $("#dLng").val(); if (dLng == '') { alert('经纬度不能为空!'); return false; } - */ var name = $("#districtName").val(); if (name == '') { @@ -1169,14 +1167,56 @@ $(document).ready(function(){ } } - - /* var address = $("#address").val(); if (address == '') { alert('小区地址不能为空!'); return false; } - */ + + var id = $("#districtId").val(); + + var flg = false; + jQuery.ajax({ + type: 'POST', + async: false, + url: '../district/validateDistrictName', + data: {city:city,region:region,name:name,cat:"district", id:id}, + dataType: 'json', + timeout: 100000, + success: function(model) { + if(model.exist){ + alert("小区名已存在"); + flg = true; + } + }, + error : function() { + + } + }); + + if(flg){ + return false; + } + + jQuery.ajax({ + type: 'POST', + async: false, + url: '../district/checkDistrictName', + data: {city:city,region:region,name:name,cat:"district",id:id}, + dataType: 'json', + timeout: 100000, + success: function(model) { + if(model.exist){ + alert("小区名是其他小区的别名"); + flg = true; + } + }, + error : function() { + } + }); + if(flg){ + return false; + } jQuery.ajax({ type: 'POST', @@ -1188,15 +1228,15 @@ $(document).ready(function(){ success: function(model) { if (model.msg) { alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!'); - return false; - } else { - return true; + flg = true; } }, error : function() { } }); - + if(flg){ + return false; + } return true; });