From 81406fbab9b6be9c61c115f5daf3f9bbfa4d256a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 22 Jan 2021 12:29:40 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml
index b71cf45..059acf2 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml
@@ -9,7 +9,6 @@
             create_time,
             create_by,
             id,
-            vip_id,
             label,
             shop_id,
             company_id,
@@ -20,7 +19,6 @@
             #{createTime},
             #{createBy},
             #{id},
-            #{vipId},
             #{label},
             #{shopId},
             #{companyId},
@@ -56,14 +54,30 @@
     </select>
 
     <select id="selectByModel" resultType="com.matrix.system.hive.bean.SysVipLabel">
-        select * from sys_vip_label
+        select
+            create_time createTime,
+            create_by createBy,
+            id,
+            label,
+            shop_id shopId,
+            company_id companyId,
+            is_all isAll,
+            user_id userId,
+            color
+        from sys_vip_label
         where 1=1
         <if test="record!=null">
             <if test="record.label!=null  and record.label!=''">
-                and label=#{record.label}
+                and label like CONCAT('%', CONCAT(#{record.label},'%'))
             </if>
-            <if test="record.vipId!=null">
-                and vip_id=#{record.vipId}
+            <if test="record.isAll!=null  and record.isAll!=0">
+                and is_all=#{record.isAll}
+            </if>
+            <if test="record.userId!=null  and record.userId!=''">
+                and user_id=#{record.userId}
+            </if>
+            <if test="record.companyId!=null  and record.companyId!=''">
+                and company_id=#{record.companyId}
             </if>
         </if>
     </select>

--
Gitblit v1.9.1