From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/supplier/SupplierMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/supplier/SupplierMapper.xml b/src/main/resources/mapper/supplier/SupplierMapper.xml
index 2337500..1f21e2f 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}, '%')
@@ -35,6 +37,9 @@
AND t.create_time <= #{dto.createDateEnd}
]]>
</if>
+ <if test="dto.isEnabled!=null">
+ AND t.is_enabled = #{dto.isEnabled}
+ </if>
order by t.create_time desc
</select>
<select id="findSupplierDetail" resultType="com.mzl.flower.dto.response.supplier.SupplierDTO"
--
Gitblit v1.9.3