getMasterDistrictNname 改为getMasterDistrictNname
This commit is contained in:
+6
-6
@@ -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<String, Object> data = new HashMap<String, Object>();
|
||||
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<District> list = districtService.findAllByParams(params);
|
||||
if (list == null || list.size() == 0) {
|
||||
json.setSuccess(false);
|
||||
|
||||
Reference in New Issue
Block a user