From c025b8924951a17e1bd1a10cea671a6c1534bdc0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 11:36:20 +0800
Subject: [PATCH] 10.18
---
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index b4b93a9..7810396 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -102,9 +102,10 @@
</where>
</select>
<select id="listExipre" resultType="com.dsh.other.model.dto.siteDto.TSiteDTO">
- select t1.*,t2.name storeName,t3.name siteTypeName from t_site t1
+ select t1.*,t2.name storeName,t3.name siteTypeName ,t4.name operator from t_site t1
inner join t_store t2 on t1.storeId = t2.id
left join t_site_type t3 on t1.siteTypeId = t3.id
+ left join t_operator t4 on t1.operatorId = t4.id
<where>
<if test="query.objectType == 2">
and t1.cityManagerId = #{query.objectId}
@@ -113,10 +114,10 @@
and t2.storeStaffId = #{query.objectId}
</if>
<if test="query.city!=null and query.city!= ''">
- and t1.city = #{query.city}
+ and t1.cityCode = #{query.city}
</if>
<if test="query.province!=null and query.province!= ''">
- and t1.province = #{query.province}
+ and t1.provinceCode = #{query.province}
</if>
<if test="query.siteTypeId!=null and query.siteTypeId!= ''">
and t1.siteTypeId = #{query.siteTypeId}
@@ -127,6 +128,10 @@
<if test="query.name!=null and query.name!= ''">
and t1.name like concat('%',#{query.name},'%')
</if>
+
+ <if test="query.opId!=null ">
+ and t1.operatorId =#{query.opId}
+ </if>
and t1.state != 3
</where>
--
Gitblit v1.7.1