From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index 9c3cf12..8902a0d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/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);

--
Gitblit v1.7.1