Pu Zhibing
2025-05-16 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -123,6 +123,27 @@
            }
        }
        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){
            return null;
        }
        List<Company> query = companyMapper.queryList(collect, 3);
@@ -163,6 +184,27 @@
            }
        }
        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){
            return null;
        }
        return companyMapper.query1(collect);