diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml index 79e29e4b0..50b4fa203 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml @@ -14,7 +14,7 @@ FROM active_price main LEFT JOIN active_price_oil apo ON main.id = apo.active_id - LEFT JOIN t_account ta on main.createBy = ta.acct_id + LEFT JOIN t_account ta on main.create_by = ta.acct_id AND main.chain_stor_id = #{entity.chainStorId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceOilServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceOilServiceImpl.java index 148cf357e..116f503c1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceOilServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceOilServiceImpl.java @@ -58,6 +58,7 @@ public class ActivePriceOilServiceImpl extends ServiceImpl