From cd53b98d57136461f1ec84632218654f7c037b80 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 22 十二月 2024 21:41:57 +0800
Subject: [PATCH] 1.行政区划对接-高德 2.行政区划对接-腾讯
---
src/main/resources/mapper/supplier/SupplierMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/supplier/SupplierMapper.xml b/src/main/resources/mapper/supplier/SupplierMapper.xml
index 2337500..54c5a01 100644
--- a/src/main/resources/mapper/supplier/SupplierMapper.xml
+++ b/src/main/resources/mapper/supplier/SupplierMapper.xml
@@ -7,11 +7,13 @@
SELECT
t.*,
s.name as stationName,
- st.`name` as typeName
+ st.`name` as typeName,
+ us.login_name as registerTel
FROM
t_supplier_info t
LEFT JOIN t_station s ON t.station_id = s.id
LEFT JOIN t_supplier_type st ON t.type_id = st.id
+ LEFT JOIN t_user us ON t.user_id = us.id and us.type='supplier'
WHERE t.deleted = 0
<if test="dto.name!=null and dto.name!=''">
AND t.name LIKE CONCAT('%',#{dto.name}, '%')
@@ -34,6 +36,12 @@
<![CDATA[
AND t.create_time <= #{dto.createDateEnd}
]]>
+ </if>
+ <if test="dto.isEnabled!=null">
+ AND t.is_enabled = #{dto.isEnabled}
+ </if>
+ <if test="dto.id!=null">
+ AND t.id = #{dto.id}
</if>
order by t.create_time desc
</select>
@@ -60,5 +68,6 @@
LEFT JOIN t_station s ON t.station_id = s.id
LEFT JOIN t_supplier_type st ON t.type_id = st.id
WHERE t.user_Id=#{userId}
+ and t.deleted = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3