Merge branch 'open_bohai' into 'master'
东莞估值添加如果区域和城市相同,则忽略区域查询 See merge request !559
This commit is contained in:
+1
-1
@@ -955,7 +955,7 @@ public class PropertyController {
|
|||||||
District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),
|
District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),
|
||||||
"district");
|
"district");
|
||||||
if (district == null) {
|
if (district == null) {
|
||||||
if(model.getDistrict().contains("市辖区")){
|
if(model.getDistrict().contains("市辖区") || model.getDistrict().contains(model.getCity())){
|
||||||
district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "district");
|
district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "district");
|
||||||
}
|
}
|
||||||
if(district == null){
|
if(district == null){
|
||||||
|
|||||||
Reference in New Issue
Block a user