Merge branch 'script_gj' into 'master'

Script gj

See merge request !514
This commit is contained in:
2023-01-17 17:45:20 +08:00
@@ -335,8 +335,15 @@ public class DbUtils{
keys.append("lng2", 1)
keys.append("estate_type2", 1)
DbUtils.SEAWEED_SLAVE.find(query, keys).each {BasicDBObject dbo->
if(!district._id || dbo._id != district._id){
districts << dbo
if(district.estateType){
if(dbo.estate_type2 == district.estateType){
districts << dbo
}
}else{
districts << dbo
}
}
}
}