|
@@ -29,7 +29,12 @@ public class countryareaid extends Controller {
|
|
|
for (Row cityrow : cityrows) {
|
|
for (Row cityrow : cityrows) {
|
|
|
String city = cityrow.getString("city");
|
|
String city = cityrow.getString("city");
|
|
|
Rows countyrows = countyrowsMap.get(province + city);
|
|
Rows countyrows = countyrowsMap.get(province + city);
|
|
|
- cityrow.put("county", countyrows.removeColumn(new String[]{"province", "city"}).toArray("county"));
|
|
|
|
|
|
|
+ if (countyrows.isEmpty()) {
|
|
|
|
|
+ String[] countys = new String[]{"ÊÐÏ½Çø"};
|
|
|
|
|
+ cityrow.put("county", countys);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ cityrow.put("county", countyrows.removeColumn(new String[]{"province", "city"}).toArray("county"));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
provincerow.put("city", cityrows.removeColumn(new String[]{"province"}));
|
|
provincerow.put("city", cityrows.removeColumn(new String[]{"province"}));
|
|
|
}
|
|
}
|
|
@@ -50,11 +55,16 @@ public class countryareaid extends Controller {
|
|
|
for (Row cityrow : cityrows) {
|
|
for (Row cityrow : cityrows) {
|
|
|
String city = cityrow.getString("city");
|
|
String city = cityrow.getString("city");
|
|
|
Rows countyrows = countyrowsMap.get(province + city);
|
|
Rows countyrows = countyrowsMap.get(province + city);
|
|
|
- cityrow.put("county", countyrows.removeColumn(new String[]{"province", "city"}).toArray("county"));
|
|
|
|
|
|
|
+ if (countyrows.isEmpty()) {
|
|
|
|
|
+ String[] countys = new String[]{"ÊÐÏ½Çø"};
|
|
|
|
|
+ cityrow.put("county", countys);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ cityrow.put("county", countyrows.removeColumn(new String[]{"province", "city"}).toArray("county"));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
provincerow.put("city", cityrows.removeColumn(new String[]{"province"}));
|
|
provincerow.put("city", cityrows.removeColumn(new String[]{"province"}));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return getReturnObject_suc(provincerows,true).toString();
|
|
|
|
|
|
|
+ return getReturnObject_suc(provincerows, true).toString();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|