Pu Zhibing
2025-05-09 bd320a2fd55964833d1d8f137beb1a169d0b88f2
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -68,17 +68,38 @@
            String englishName = city1.getEnglishName();
            String frenchName = city1.getFrenchName();
            for (String s : city) {
                if(s.contains(chineseName)){
                if(s.equals(chineseName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.contains(englishName)){
                if(s.equals(englishName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.contains(frenchName)){
                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;
                    }
                }
            }
        }
@@ -99,17 +120,38 @@
            String englishName = city1.getEnglishName();
            String frenchName = city1.getFrenchName();
            for (String s : city) {
                if(s.contains(chineseName)){
                if(s.equals(chineseName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.contains(englishName)){
                if(s.equals(englishName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.contains(frenchName)){
                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;
                    }
                }
            }
        }
@@ -137,20 +179,41 @@
            String englishName = city1.getEnglishName();
            String frenchName = city1.getFrenchName();
            for (String s : city) {
                if(s.contains(chineseName)){
                if(s.equals(chineseName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.contains(englishName)){
                if(s.equals(englishName)){
                    collect.add(city1.getId());
                    break;
                }
                if(s.contains(frenchName)){
                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;
                    }
                }
            }
        }
        List<Company> query = companyMapper.queryList1(collect, 3);
        if(query.size() == 0){
            query = companyMapper.queryList1(collect, 2);