'commit'

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

@@ -46,14 +46,12 @@ public class ReadDocxUtil {
     public String getCityName(String fileName) {
         //云南省下所有城市
         List<String> listCity = getCityNameList();
-        //城市名称的前两位一样就视为一样
-        String top2 = fileName.substring(0, 2);
 
         //判断是哪个城市
         boolean found = false;
         String cityName = "";
         for (String s : listCity) {
-            if (s.startsWith(top2)) {
+            if (fileName.contains(s.substring(0, 2))) {
                 found = true;
                 cityName = s;
             }