From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
index 877aa14..4660ac1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
@@ -274,7 +274,7 @@
left join shop_product t3 on t2.goods_id=t3.id
left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1 and t1.act_type=1
- and company_id=#{companyId}
+ and t1.company_id=#{record.companyId}
<if test="record !=null"><!-- 判断pageVo对象是否为空 -->
<if test="record.sort !=null and record.order !=null">
order by
@@ -294,7 +294,7 @@
left join shop_product t3 on t2.goods_id=t3.id
left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1
- and company_id=#{companyId}
+ and t1.company_id=#{record.companyId}
</select>
<select id="selectGroupInfoByActId" resultMap="ShopActivitiesGroupInfoMap">
--
Gitblit v1.9.1