From 6d5ebf8cc72f9a342ca81239f1d65519bfa4041b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:37:48 +0800
Subject: [PATCH] fix:修复
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
index 0d3affe..69f5751 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
@@ -63,13 +63,13 @@
f.receive_address receiveAddress
FROM
activity_sign_writeoff a
- left join biz_user b on a.user_id= b.user_id
+ left join sys_vip_info b on a.user_id= b.id
left join shop_activities c on a.act_id= c.id
left join activity_sign_award_set d on a.award_id= d.id
left join activity_sign_receive_record e on a.receive_id= e.id
left join shop_delivery_info f on a.logistics_id= f.id
<where>
- a.company_id = #{record.companyId}
+ a.company_id = #{record.companyId} and (b.IS_DELETE is null or b.IS_DELETE = '')
<if test="record.zjzxm != null and record.zjzxm != ''">
and b.nick_name like concat('%',#{record.zjzxm},'%')
</if>
@@ -89,8 +89,8 @@
b.nick_name zjr
FROM
activity_sign_receive_record a
- left join biz_user b on a.user_id= b.user_id
- where a.user_id = #{userId} and a.award_id = #{receiveId}
+ left join sys_vip_info b on a.user_id= b.id
+ where a.user_id = #{userId} and a.award_id = #{receiveId} and (b.IS_DELETE is null or b.IS_DELETE = '')
</select>
<select id="selectShopDeliveryInfoByLogisticsId" resultType="com.matrix.system.shopXcx.bean.ShopDeliveryInfo">
@@ -105,8 +105,9 @@
SELECT
*
FROM
- shop_delivery_info a
- where a.id = #{logisticsId}
+ activity_sign_writeoff a
+ where a.receive_id = #{receiveId}
+ and a.user_id = #{userId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1