From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml
index 213317e..90270d6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml
@@ -22,14 +22,12 @@
companyId as companyId
from t_phone where companyId in (
select companyId from t_company_city where state = 1
- <if test="null != province">
- and provinceCode = #{province}
- </if>
<if test="null != city">
- and cityCode = #{city}
- </if>
- <if test="null != code">
- and areaCode = #{code}
+ and cityId in (select id from t_city where englishName in
+ <foreach collection="city" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ )
</if>
)
</select>
@@ -52,14 +50,12 @@
<if test="platform != 1">
and companyId in (
select companyId from t_company_city where state = 1
- <if test="null != province">
- and provinceCode = #{province}
- </if>
<if test="null != city">
- and cityCode = #{city}
- </if>
- <if test="null != code">
- and areaCode = #{code}
+ and cityId in (select id from t_city where englishName in
+ <foreach collection="city" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ )
</if>
)
</if>
--
Gitblit v1.7.1