'commit'

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

@@ -100,7 +100,7 @@ public class A15 {
             int pos = content.indexOf(s);
             if (pos < 0) {
                 System.out.println(s + "在给定的文本中没有找到，程序无法继续，请人工检查！");
-                System.exit(-1);
+                return null;
             }
             posList.add(pos);
         }
@@ -186,6 +186,7 @@ public class A15 {
                 //获取教育发展现状态
                 try {
                     List<String> list = getDocxJYFZXZ(file.getAbsolutePath());
+                    if (list == null) continue;
                     Row outRow = outSheet.createRow(++rowIndex);
                     DsKit.putData(outRow, Arrays.asList(cityName, areaName, "入园入校", list.get(0), list.get(1), list.get(2), list.get(3)), dataStyle);
                     outRow = outSheet.createRow(++rowIndex);