Merge branch 'open_gj' of http://gitlab.fangjia.com/dev0/main into open_gj

This commit is contained in:
2021-11-10 11:57:06 +08:00
@@ -2789,7 +2789,7 @@ public class AddressController {
if(searchAddress.containsKey("streetNumber")){
searchKey.append(searchAddress.getString("streetNumber"));
}
if(StringUtils.isNotBlank(searchKey.toString()) && StringUtils.isNotBlank(searchAddress.getString("city"))){
if(StringUtils.isNotBlank(searchKey.toString()) && searchAddress.has("city") && StringUtils.isNotBlank(searchAddress.getString("city"))){
JSONObject jsonObject = addressMatchProxyService.searchByAmap(searchAddress.getString("city"), model.getAddress());
JSONArray poisData = jsonObject.getJSONArray("pois");
for (int i = 0; i < poisData.size(); i++) {