From 3af9c82375df6bd77ae78a5d900c409a895ecd18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:10:16 +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, 5 insertions(+), 19 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 0c52a1d..b37ae32 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
@@ -20,15 +20,10 @@
platform as platform,
phone as phone,
companyId as companyId
- from t_phone where companyId in (
- select companyId from t_company_city where state = 1
- <if test="null != city">
- and cityId in (select id from t_city where englishName in
- <foreach collection="city" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- )
- </if>
+ from t_phone where companyId in
+ <foreach collection="companyIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
)
</select>
@@ -48,16 +43,7 @@
and platform = #{platform}
</if>
<if test="platform != 1">
- and companyId in (
- select companyId from t_company_city where state = 1
- <if test="null != city">
- and cityId in (select id from t_city where englishName in
- <foreach collection="city" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- )
- </if>
- )
+ and companyId = #{companyId}
</if>
</select>
--
Gitblit v1.7.1