From 0dfe139c391e5598b241f714aba4ee053ba8dc97 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 15:31:06 +0800
Subject: [PATCH] 20210420 签到
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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..b9f2426 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">
@@ -120,6 +118,9 @@
SELECT
a.id id,
a.state state,
+ a.consignee_phone consigneePhone,
+ a.consignee_address consigneeAddress,
+ a.consignee
a.receive_time receiveTime,
a.write_off_code writeOffCode,
1 total,
@@ -135,7 +136,7 @@
activity_sign_receive_record a
LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
WHERE
- a.id = #{record.awardId}
+ a.award_id = #{record.awardId}
and a.company_id = #{record.companyId}
and a.user_id = #{record.userId}
</select>
--
Gitblit v1.9.1