From b6dd42b974a9a2fafc511acb2df3446c52fda200 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 May 2022 14:18:51 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml
index 2e74316..cb7b22f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml
@@ -248,7 +248,7 @@
from shop_activities_group_join t1
inner join shop_activities_group_price t2 on t1.gp_id=t2.id
inner join sys_vip_info t3 on t1.gj_head_id=t3.id
- where t1.act_id = #{record.actId}
+ where t1.act_id = #{record.actId} and (t3.IS_DELETE is null or t3.IS_DELETE = '')
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
<if test="pageVo.sort !=null and pageVo.order !=null">
order by
@@ -311,7 +311,7 @@
from shop_activities_group_join t1
inner join shop_activities_group_join_user t2 on t1.id=t2.gj_id and t2.is_has_cancel=2 and t2.is_has_pay=1
left join sys_vip_info t3 on t2.user_id=t3.id
- where t1.id=#{gjId}
+ where t1.id=#{gjId} and (t3.IS_DELETE is null or t3.IS_DELETE = '')
</select>
<select id="selectOwnerGroupJoinInfoWithNoPay" resultMap="ShopActivitiesGroupJoinMap">
@@ -328,7 +328,7 @@
from shop_activities_group_join t1
inner join shop_activities_group_join_user t2 on t1.id=t2.gj_id and t2.is_has_cancel=2
left join sys_vip_info t3 on t2.user_id=t3.id
- where t1.id=#{gjId}
+ where t1.id=#{gjId} and (t3.IS_DELETE is null or t3.IS_DELETE = '')
</select>
<select id="selectIsExistGroupInfoByUserId" resultMap="ShopActivitiesGroupJoinMap">
@@ -351,7 +351,7 @@
from shop_activities_group_join t1
inner join shop_activities_group_price t2 on t1.gp_id=t2.id
left join sys_vip_info t3 on t1.gj_head_id=t3.id
- where t1.act_id=#{actId} and t1.gj_status=3
+ where t1.act_id=#{actId} and t1.gj_status=3 and (t3.IS_DELETE is null or t3.IS_DELETE = '')
</select>
<select id="selectGroupAndPriceById" resultMap="ShopActivitiesGroupJoinMap">
--
Gitblit v1.9.1