From c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 11:52:07 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 2 --
1 files changed, 0 insertions(+), 2 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 4892c5c..bedd3e1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -86,7 +86,6 @@
LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
where
b.award_type = 1
- and a.state = 1
and a.company_id = #{companyId}
and a.user_id = #{userId}
@@ -107,7 +106,6 @@
LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
WHERE
b.award_type = 1
- AND a.state = 1
and a.company_id = #{record.companyId}
and a.user_id = #{record.userId}
<if test="record.sort !=null">
--
Gitblit v1.9.1