姜友瑶
2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba
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">