diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/didata/MatchFromExcel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/didata/MatchFromExcel.groovy index 20de59c5f..6cf7730ee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/didata/MatchFromExcel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/didata/MatchFromExcel.groovy @@ -14,13 +14,15 @@ ExcelUtils.multiThreadingModify("D:\\Users\\Domi\\Documents\\֪ʶ def gaodeRegion = row['H'] def gaodeName = row['I'] - def jsonObject = OpenApiClient.addressMatch(city, null, "district", false, region, district_name, "strict") + def jsonObject = OpenApiClient.addressMatch(city, district_name, "district", false, region, district_name, "strict") if (jsonObject != null && jsonObject.precise != -1) { row['D'] = jsonObject.get("name") } - def jsonObject2 = OpenApiClient.addressMatch(city, null, "district", false, gaodeRegion, gaodeName, "strict") - if (jsonObject != null && jsonObject.precise != -1) { - row['J'] = jsonObject.get("name") + if (gaodeRegion && gaodeName) { + def jsonObject2 = OpenApiClient.addressMatch(city, gaodeName, "district", false, gaodeRegion, gaodeName, "strict") + if (jsonObject2 != null && jsonObject2.precise != -1) { + row['J'] = jsonObject2.get("name") + } } });