From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516  逻辑删除,更新字段IS_Delete字段为已删除,默认为空,删除后其余信息从查询中过滤了

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
index 868f5e3..0d96af4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -15,14 +15,17 @@
 		c.award_type awardType,
 		c.award_name awardName,
 		c.coupon_name couponName,
+		c.score_cnt scoreCnt,
+		d.act_type actType,
 		c.award_rule awardRule
 		FROM
 		activity_sign_receive_record a
 		LEFT JOIN sys_vip_info b ON a.user_id = b.id
 		LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
+		LEFT JOIN shop_activities d ON a.award_id = d.id
 		<where>
 			a.company_id = #{record.companyId}
-			and a.activity_id = #{record.actId}
+			and a.activity_id = #{record.actId} and (b.IS_DELETE is null or b.IS_DELETE = '')
 			<if test="record.yhmc != null and record.yhmc != ''">
 				and b.nick_name like concat('%',#{record.yhmc},'%')
 			</if>

--
Gitblit v1.9.1