diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
index 47437a1f7..1d3276b81 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelDieselMapper;
 import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel;
 import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService;
+import com.fuint.business.petrolStationManagement.entity.OilName;
 import com.fuint.business.petrolStationManagement.service.OilNameService;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
@@ -110,6 +111,8 @@ public class CardFuelDieselServiceImpl extends ServiceImpl<CardFuelDieselMapper,
         List<CardFuelDiesel> records = page1.getRecords();
         ArrayList<CardFuelDiesel> cardFuelDiesels = new ArrayList<>();
         for (CardFuelDiesel record : records) {
+            OilName oilName = oilNameService.selectOilNameById(Integer.parseInt(record.getOilType()));
+            record.setOilType(oilName.getOilName());
             Date startTime = record.getStartTime();
             Date endTime = record.getEndTime();
             Date date = new Date();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index 9390a2698..2e003ec4f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -371,8 +371,8 @@
         AND ad.STATUS = 0
         AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%')
         AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%')
-        HAVING sum(adr.id)  <![CDATA[ < ]]>  limitAcount
         GROUP BY ad.id
+        HAVING IFNULL(sum(adr.id),0) <![CDATA[ < ]]> limitAcount
     </select>
 
     <select id="selectActiveFule" resultType="com.fuint.business.marketingActivity.activeDiscount.vo.ActiveDiscountPayVO">
@@ -396,8 +396,8 @@
           AND af.STATUS = 0
           AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%')
           AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%')
-          HAVING sum(afr.id)  <![CDATA[ < ]]>  limitAcount
         GROUP BY af.id
+        HAVING IFNULL(sum(afr.id),0) <![CDATA[ < ]]> limitAcount
     </select>
 
     <select id="selectActiveConsumption" resultType="com.fuint.business.marketingActivity.activeDiscount.vo.ActiveConsumptionVO">