From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index 074510f..8430765 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -17,14 +17,18 @@
<select id="selectStorePage" resultType="com.ycl.vo.store.StoreInfoVO">
SELECT
t1.*,
- t2.`name`
+ t2.`name` as typeName
FROM
ums_store_store_info t1
- JOIN ums_data_dictionary t2 ON t1.type = t2.id
+ left JOIN ums_data_dictionary t2 ON t1.type = t2.id
<where>
<if test="keyword!=null and keyword!=''">
- t1.store_name LIKE CONCAT('%', #{keyword}, '%')
+ t1.store_number LIKE CONCAT('%', #{keyword}, '%')
+ </if>
+ <if test="status!=null and status!='' and status!='0' ">
+ and t1.status = #{status}
</if>
</where>
+ order by t1.id desc
</select>
</mapper>
--
Gitblit v1.8.0