From eaefb5f0d4fb5918786936dd60f4be7dd93011ba Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 12:20:30 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 69f5751..748d06f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
@@ -69,7 +69,7 @@
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} and (b.IS_DELETE is null or b.IS_DELETE = '')
+ a.company_id = #{record.companyId}
<if test="record.zjzxm != null and record.zjzxm != ''">
and b.nick_name like concat('%',#{record.zjzxm},'%')
</if>
@@ -90,7 +90,7 @@
FROM
activity_sign_receive_record a
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 = '')
+ where a.user_id = #{userId} and a.award_id = #{receiveId}
</select>
<select id="selectShopDeliveryInfoByLogisticsId" resultType="com.matrix.system.shopXcx.bean.ShopDeliveryInfo">
--
Gitblit v1.9.1