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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index abc4a0c..8430765 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -23,7 +23,10 @@
             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

--
Gitblit v1.8.0