'commit'

src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java

@@ -70,20 +70,17 @@ public class ReadDocxUtil {
      * @return
      */
     public String getAreaName(String fileName) {
-        List<Record> listAreaRecord = dm.getProvinceArea(privinceName);
+        List<Record> list = dm.getProvinceArea(privinceName);
-        List<String> listCity = new ArrayList<>();
+        List<String> listArea = new ArrayList<>();
-        for (Record record : listAreaRecord) {
+        for (Record record : list) {
-            listCity.add(record.getStr("area_name"));
+            listArea.add(record.getStr("area_name"));
-        }
+        }
-        //城市名称的前两位一样就视为一样
-        String result = fileName.replaceAll("^[^\u4e00-\u9fa5]++", "");//去掉开头非中文符号
-        String top2 = result.substring(0, 2);
 
         //判断是哪个城市
         boolean found = false;
         String areaName = "";
-        for (String s : listCity) {
+        for (String s : listArea) {
-            if (s.startsWith(top2)) {
+            if (fileName.contains(s.substring(0, 2))) {
                 found = true;
                 areaName = s;
             }