From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java |   82 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index 6077c3e..8b6c035 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -68,23 +68,45 @@
             String englishName = city1.getEnglishName();
             String frenchName = city1.getFrenchName();
             for (String s : city) {
-                if(s.indexOf(chineseName) != -1){
+                if(s.equals(chineseName)){
                     collect.add(city1.getId());
                     break;
                 }
-                if(s.indexOf(englishName) != -1){
+                if(s.equals(englishName)){
                     collect.add(city1.getId());
                     break;
                 }
-                if(s.indexOf(frenchName) != -1){
+                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){
             return null;
         }
+        System.err.println("城市ids：" + collect);
         return companyMapper.query(collect);
     }
     
@@ -98,17 +120,38 @@
             String englishName = city1.getEnglishName();
             String frenchName = city1.getFrenchName();
             for (String s : city) {
-                if(s.indexOf(chineseName) != -1){
+                if(s.equals(chineseName)){
                     collect.add(city1.getId());
                     break;
                 }
-                if(s.indexOf(englishName) != -1){
+                if(s.equals(englishName)){
                     collect.add(city1.getId());
                     break;
                 }
-                if(s.indexOf(frenchName) != -1){
+                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;
+                    }
                 }
             }
         }
@@ -136,20 +179,41 @@
             String englishName = city1.getEnglishName();
             String frenchName = city1.getFrenchName();
             for (String s : city) {
-                if(s.indexOf(chineseName) != -1){
+                if(s.equals(chineseName)){
                     collect.add(city1.getId());
                     break;
                 }
-                if(s.indexOf(englishName) != -1){
+                if(s.equals(englishName)){
                     collect.add(city1.getId());
                     break;
                 }
-                if(s.indexOf(frenchName) != -1){
+                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);

--
Gitblit v1.7.1