From eaefb5f0d4fb5918786936dd60f4be7dd93011ba Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 12:20:30 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml
index 0403365..92bb717 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml
@@ -108,7 +108,7 @@
LEFT JOIN sys_proj_services b on a.service_id=b.ID
LEFT JOIN sys_vip_info c on b.VIP_ID=c.ID
LEFT JOIN sys_users e on e.su_id=a.operation_id
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record!=null">
<if test="record.beginTime != null ">
@@ -158,7 +158,7 @@
LEFT JOIN sys_proj_services b on a.service_id=b.ID
LEFT JOIN sys_vip_info c on b.VIP_ID=c.ID
LEFT JOIN sys_users e on e.su_id=a.operation_id
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record!=null">
<if test="record.beginTime != null ">
@@ -171,7 +171,7 @@
and a.operation_id = #{record.operationId}
</if>
<if test="record.shopId != null and record.shopId !='' ">
- AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId} and (t.IS_DELETE is null or t.IS_DELETE = ''))
+ AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId} )
</if>
<if test="record.shopId != null and record.shopId !='' ">
AND b.shop_id = #{record.shopId}
@@ -202,7 +202,7 @@
LEFT JOIN sys_proj_services b on a.service_id=b.ID
LEFT JOIN sys_vip_info c on b.VIP_ID=c.ID
LEFT JOIN sys_users e on e.su_id=a.operation_id
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record!=null">
<if test="record.beginTime != null ">
@@ -244,7 +244,7 @@
LEFT JOIN sys_proj_services b on a.service_id=b.ID
LEFT JOIN sys_vip_info c on b.VIP_ID=c.ID
LEFT JOIN sys_users e on e.su_id=a.operation_id
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record!=null">
<if test="record.beginTime != null ">
@@ -257,7 +257,7 @@
and a.operation_id = #{record.operationId}
</if>
<if test="record.shopId != null and record.shopId !='' ">
- AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId} and (t.IS_DELETE is null or t.IS_DELETE = ''))
+ AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId} )
</if>
<if test="record.searchShop != null and record.searchShop !=''">
AND b.shop_id = #{record.searchShop}
@@ -302,7 +302,7 @@
LEFT JOIN sys_proj_services b on a.service_id=b.ID
LEFT JOIN sys_vip_info c on b.VIP_ID=c.ID
LEFT JOIN sys_users e on e.su_id=a.operation_id
- where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
+ where 1=1
<if test="record!=null">
<if test="record.beginTime != null ">
--
Gitblit v1.9.1