Merge branch 'open_bohai' into 'master'

Open bohai

See merge request !558
This commit is contained in:
2023-03-01 17:36:14 +08:00
3 changed files with 35 additions and 9 deletions
@@ -955,8 +955,13 @@ public class PropertyController {
District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),
"district");
if (district == null) {
mav.setModel(BasicModel.buildBadRequestModel("该小区不存在"));
return mav;
if(model.getDistrict().contains("市辖区")){
district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "district");
}
if(district == null){
mav.setModel(BasicModel.buildBadRequestModel("该小区不存在"));
return mav;
}
}
model.setName(district.getName());