From bfe54b47a60263a6d5442a2558da09e5c71634a5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 4 Sep 2024 17:03:59 +0800
Subject: [PATCH] 9.4

---
 .../activePrice/mapper/xml/ActivePriceMapper.xml                | 2 +-
 .../activePrice/service/impl/ActivePriceOilServiceImpl.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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
         <where>
             <if test="entity.chainStorId != null and entity.chainStorId != ''">
                 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<ActivePriceOilMapper,
             AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
             item.setChainStoreId(nowAccountInfo.getChainStoreId());
             item.setStoreId(nowAccountInfo.getStoreId());
+            item.setOilId(item.getId());
         });
         saveBatch(oilList);
     }