From c80fa36ef5e9cfc48a368939e61c9e89a6b5ecc8 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 13 Jun 2022 16:29:24 +0800
Subject: [PATCH] fix:排除删除会员方法
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 2ced513..5fc09d3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -165,7 +165,7 @@
LEFT JOIN shopping_goods_category i ON e.cate_id = i.id
left join sys_proj_services l on a.service_order_id=l.id
<where>
- and (c.IS_DELETE is null or c.IS_DELETE = '')
+
<if test="record!=null">
<if
test="(record.shopId!=null and record.shopId!='') or (record.shopId!='' and record.shopId==0) ">
@@ -267,7 +267,7 @@
LEFT JOIN shopping_goods_category j ON i.parent_id = j.id
left join sys_proj_services l on a.service_order_id=l.id
<where>
- and (c.IS_DELETE is null or c.IS_DELETE = '')
+
<if test="record!=null">
<if
test="(record.shopId!=null and record.shopId!='') or (record.shopId!='' and record.shopId==0) ">
@@ -891,7 +891,7 @@
left join sys_users b on a.BEATUY_ID=b.su_id
inner join sys_shop_info c on c.id=a.SHOP_ID
<where>
- and (a.IS_DELETE is null or a.IS_DELETE = '')
+
<if test="record.vipName != null and record.vipName !=''">
and (a.vip_name like CONCAT(CONCAT('%', #{record.vipName}), '%') or a.vip_no=#{record.vipName} or a.phone = #{record.vipName})
</if>
@@ -923,7 +923,7 @@
left join sys_users b on a.BEATUY_ID=b.su_id
inner join sys_shop_info c on c.id=a.SHOP_ID
<where>
- and (a.IS_DELETE is null or a.IS_DELETE = '')
+
<if test="record.vipName != null and record.vipName !=''">
and (a.vip_name like CONCAT(CONCAT('%', #{record.vipName}), '%') or a.vip_no=#{record.vipName} or a.phone = #{record.vipName})
</if>
@@ -1158,7 +1158,7 @@
left join sys_order_item j on a.order_item_id=j.ID
left join achieve_rule u on u.id=e.achieve_rule_id
<where>
- and a.company_id = #{record.companyId} and (c.IS_DELETE is null or c.IS_DELETE = '')
+ and a.company_id = #{record.companyId}
<if test="record.shopId != null">
and a.shop_id = #{record.shopId}
</if>
@@ -1294,7 +1294,7 @@
from sys_users a
left join achieve_new b on a.su_id=b.beault_id
left join sys_vip_info c on b.vip_id=c.ID
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
@@ -1340,7 +1340,7 @@
from sys_users a
left join achieve_new b on a.su_id=b.beault_id
left join sys_vip_info c on b.vip_id=c.ID
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
--
Gitblit v1.9.1