Merge branch 'open_v2' into 'master'

判断是否存在

See merge request !716
This commit is contained in:
2023-08-30 17:23:55 +08:00
@@ -1090,9 +1090,15 @@ public class PropertyController {
if(model.getFloor() == null){
JSONObject structureOb = addressMatchProxyService.addressStructure(district.getCity(), model.getAddress());
if(structureOb != null){
model.setBuildingNumber(structureOb.getString("buildingNumber"));
String roomNumber = structureOb.getString("roomNumber");
model.setFloor(getFloor(roomNumber));
if(structureOb.containsKey("buildingNumber")){
model.setBuildingNumber(structureOb.getString("buildingNumber"));
}
if(structureOb.containsKey("roomNumber")){
String roomNumber = structureOb.getString("roomNumber");
model.setFloor(getFloor(roomNumber));
}
}
}