From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 6cffee2..86ea7ec 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -79,6 +79,24 @@
group by cityCode
) as aa order by aa.code
</select>
+ <select id="queryCity2" resultType="map">
+
+ select * from (
+ select cityCode as code, city as name
+ from t_store where state = 1 and provinceCode = #{provinceCode}
+ <if test="null != cityCode and '' != cityCode">
+ and cityCode = #{cityCode}
+ </if>
+ <if test="null != type">
+ and `type` = #{type}
+ </if>
+ <if test="null != operatorId">
+ and operatorId = #{operatorId}
+ </if>
+ group by cityCode
+ ) as aa order by aa.code
+ </select>
+
<select id="queryCity1" resultType="map">
select * from (
select cityCode as code, city as name from t_store where state = 1
--
Gitblit v1.7.1