From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-other/src/main/resources/mapper/StoreMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
index 0ec501c..d34fe54 100644
--- a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
@@ -17,7 +17,12 @@
</select>
<select id="queryStoreByCityCode" resultType="com.dsh.other.model.BaseVo">
- select id, name from t_store where state = 1 and cityCode = #{cityCode}
+ select id, name from t_store where state = 1
+ and provinceCode = #{provinceCode}
+ <if test="cityCode !=null and cityCode !='' ">
+ and cityCode = #{cityCode}
+ </if>
+
</select>
<select id="getStoreByCityManagerId" resultType="com.dsh.other.entity.Store">
select * from t_store where operatorId = #{id}
@@ -43,4 +48,9 @@
</select>
+ <select id="getStoreInfo" resultType="com.dsh.other.model.dto.siteDto.StoreInfoDto">
+ select CONCAT(t2.name,"-",t2.phone) as info
+ from sys_user t2
+ where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.7.1