From 620bf0f8d8d71619310b0dd2193d4543eccdbd14 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 1 Jun 2022 10:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/temp/shenjian/didata/MatchFromExcel.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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") + } } });