From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AdvertisementMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AdvertisementMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AdvertisementMapper.xml
index 1de0fcf..d1b87e9 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AdvertisementMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AdvertisementMapper.xml
@@ -41,7 +41,15 @@
and `type` = #{type}
</if>
<if test="null != city">
- and cityId in (select id from t_city where englishName in
+ and cityId in (select id from t_city where chineseName in
+ <foreach collection="city" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ or englishName in
+ <foreach collection="city" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ or frenchName in
<foreach collection="city" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.7.1