From 0a20f349bffa7a7d7e0af246013473d2f72c4a6f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 四月 2025 18:12:36 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 73cdfc4..9c3cf12 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
@@ -108,11 +108,22 @@
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){
+ return null;
}
List<Company> query = companyMapper.queryList(collect, 3);
if(query.size() == 0){
@@ -137,7 +148,15 @@
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;
}
--
Gitblit v1.7.1