Merge branch 'script_gj' into 'master'

update

See merge request !39
This commit is contained in:
2021-06-08 16:09:31 +08:00
@@ -121,7 +121,7 @@ class DistrictInfoExportBatch extends BaseBatch{
def newAlias = []
if(alias){
for(def name : alias){
if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(")){
if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(") && !newAlias.contains(name)){
newAlias << name
}
}
@@ -129,7 +129,7 @@ class DistrictInfoExportBatch extends BaseBatch{
if(addr_alias){
for(def name : addr_alias){
if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(")){
if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(") && !newAlias.contains(name)){
newAlias << name
}
}