修改文档bug

Pu Zhibing

7 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java

@@ -108,9 +108,38 @@
            String englishName = city1.getEnglishName();
            String frenchName = city1.getFrenchName();
            for (String s : city) {
                if(s.indexOf(chineseName) != -1 || s.indexOf(englishName) != -1 || s.indexOf(frenchName) != -1){
                if(s.equals(chineseName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.equals(englishName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.equals(frenchName)){
                    collect.add(city1.getId());
                    break;
                }
            }
        }
        if(collect.size() == 0){
            for (City city1 : cities1) {
                String chineseName = city1.getChineseName();
                String englishName = city1.getEnglishName();
                String frenchName = city1.getFrenchName();
                for (String s : city) {
                    if(s.contains(chineseName)){
                        collect.add(city1.getId());
                        break;
                    }
                    if(s.contains(englishName)){
                        collect.add(city1.getId());
                        break;
                    }
                    if(s.contains(frenchName)){
                        collect.add(city1.getId());
                        break;
                    }
                }
            }
        }
@@ -140,10 +169,39 @@
            String englishName = city1.getEnglishName();
            String frenchName = city1.getFrenchName();
            for (String s : city) {
                if(s.indexOf(chineseName) != -1 || s.indexOf(englishName) != -1 || s.indexOf(frenchName) != -1){
                if(s.equals(chineseName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.equals(englishName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.equals(frenchName)){
                    collect.add(city1.getId());
                    break;
                }
            }
        }
        if(collect.size() == 0){
            for (City city1 : cities1) {
                String chineseName = city1.getChineseName();
                String englishName = city1.getEnglishName();
                String frenchName = city1.getFrenchName();
                for (String s : city) {
                    if(s.contains(chineseName)){
                        collect.add(city1.getId());
                        break;
                    }
                    if(s.contains(englishName)){
                        collect.add(city1.getId());
                        break;
                    }
                    if(s.contains(frenchName)){
                        collect.add(city1.getId());
                        break;
                    }
                }
            }
        }
        if(collect.size() == 0){