From e8e539b6b3c86d6a8ac226449df5b5d16662798a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 18:02:39 +0800
Subject: [PATCH] 1、修改看板查询bug
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index 0f64c0b..b7b723e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -643,13 +643,10 @@
EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation
from sys_vip_info
where
- SHOP_ID=#{shopId}
- and (
instr(PHONE,#{keyWord})
or instr(VIP_NAME ,#{keyWord})
or instr(zjm ,#{keyWord})
or instr(VIP_NO ,#{keyWord})
- )
limit 0,15
</select>
@@ -674,7 +671,7 @@
and
(a.VIP_NO =#{key} or
a.VIP_NAME =#{key} or
- a.PHONE =#{key}) and a.shop_id=#{shopId}
+ a.PHONE =#{key})
</select>
<select id="getLevelIdByMoney" resultMap="SysVipInfoMap">
@@ -1320,6 +1317,9 @@
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
</if>
+ <if test="record.companyId != null">
+ and a.company_id=#{record.companyId}
+ </if>
<if test='record.birthType=="1"'>
and a.BIRTHDAY1 between curdate() and DATE_ADD(CURDATE(), INTERVAL 3 DAY)
</if>
@@ -1342,6 +1342,9 @@
<if test="record.sort != 'monthArrived' and record.sort != 'yearArrived'">
order by ${record.sort} ${record.order}
</if>
+ <if test="record.offset >=0 and record.limit >0">
+ limit #{record.offset},#{record.limit}
+ </if>
</select>
<select id="selectVipInfoById" resultType="com.matrix.system.app.vo.VipInfoVo">
--
Gitblit v1.9.1