'commit'

src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java

@@ -90,6 +90,10 @@ public class A1 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
+                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
+                    parentPathName = file.getParentFile().getParentFile().getParentFile().getName();
+                    cityName = ru.getCityOrAreaName(parentPathName);
+                }
                 if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);

src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java

@@ -90,6 +90,10 @@ public class A2 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
+                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
+                    parentPathName = file.getParentFile().getParentFile().getParentFile().getName();
+                    cityName = ru.getCityOrAreaName(parentPathName);
+                }
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);

src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java

@@ -90,6 +90,10 @@ public class A3 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
+                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
+                    parentPathName = file.getParentFile().getParentFile().getParentFile().getName();
+                    cityName = ru.getCityOrAreaName(parentPathName);
+                }
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);

src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java

@@ -90,6 +90,10 @@ public class A4 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
+                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
+                    parentPathName = file.getParentFile().getParentFile().getParentFile().getName();
+                    cityName = ru.getCityOrAreaName(parentPathName);
+                }
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);

src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java

@@ -90,6 +90,10 @@ public class A5 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
+                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
+                    parentPathName = file.getParentFile().getParentFile().getParentFile().getName();
+                    cityName = ru.getCityOrAreaName(parentPathName);
+                }
                 if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);

src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java

@@ -90,6 +90,10 @@ public class A6 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
+                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
+                    parentPathName = file.getParentFile().getParentFile().getParentFile().getName();
+                    cityName = ru.getCityOrAreaName(parentPathName);
+                }
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);