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 db5bf7e45..db63856fa 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 @@ -3513,8 +3513,8 @@ public class DistrictController { if (type.equals("master")) { masterDistrict = districtService.findById(id); } - if (dis != null && dis.getMasterDistrictNname() != null - && dis.getMasterDistrictNname().equals("master")) { + if (dis != null && dis.getMasterDistrictName() != null + && dis.getMasterDistrictName().equals("master")) { json.setSuccess(false); json.setMsg(dis.getName() + "已经是主小区了"); return json; @@ -3566,8 +3566,8 @@ public class DistrictController { json.setMsg("小区不存在,请检查是否输入正确"); return json; } - if (slaveDistrict.getMasterDistrictNname() != null - && slaveDistrict.getMasterDistrictNname().equals("master")) { + if (slaveDistrict.getMasterDistrictName() != null + && slaveDistrict.getMasterDistrictName().equals("master")) { json.setSuccess(false); json.setMsg(slaveDistrict.getName() + "已经是主小区了"); return json; @@ -3601,7 +3601,7 @@ public class DistrictController { if (model.getId() != null && !model.getId().equals("")) { District slaveDistrict = districtService.findById(model.getId()); District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(), - slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictNname()), "district"); + slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictName()), "district"); Map data = new HashMap(); data.put("masterDistrictNname", null); districtService.updateById(data, model.getId()); @@ -3654,7 +3654,7 @@ public class DistrictController { params.add(new QueryParam("visible", 0)); params.add(new QueryParam("city", slaveDistrict.getCity())); params.add(new QueryParam("region", slaveDistrict.getRegion())); - params.add(new QueryParam("name", slaveDistrict.getMasterDistrictNname())); + params.add(new QueryParam("name", slaveDistrict.getMasterDistrictName())); List list = districtService.findAllByParams(params); if (list == null || list.size() == 0) { json.setSuccess(false);