From d9d69baff595be349720cbf3fd52e50c14ca3d7d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 11:06:57 +0800
Subject: [PATCH] bug

---
 .../controller/ActiveFullminusController.java              | 2 +-
 .../service/impl/ActiveFullminusServiceImpl.java           | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java
index 0b340d473..c3575d063 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java
@@ -108,7 +108,7 @@ public class ActiveFullminusController extends BaseController {
      * @return
      */
     @DeleteMapping("delById/{ids}")
-    public ResponseObject delete(@PathVariable Long ids) {
+    public ResponseObject delete(@PathVariable Integer ids) {
         return getSuccessResult(this.activeFullminusService.removeById(ids));
     }
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java
index 35d09df4e..98ec55813 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java
@@ -1,5 +1,6 @@
 package com.fuint.business.marketingActivity.activeFullminus.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -20,7 +21,9 @@ import com.fuint.business.petrolStationManagement.entity.OilName;
 import com.fuint.business.petrolStationManagement.service.OilNameService;
 import com.fuint.business.store.service.StoreService;
 import com.fuint.business.userManager.service.LJUserGradeService;
+import com.fuint.common.service.AccountService;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.repository.model.TAccount;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +54,8 @@ public class ActiveFullminusServiceImpl extends ServiceImpl<ActiveFullminusMappe
     private LJUserGradeService userGradeService;
     @Resource
     private OilNameService oilNameService;
+    @Resource
+    private AccountService accountService;
     /**
      * 新增数据
      * @param activeFullminusDTO
@@ -151,6 +156,8 @@ public class ActiveFullminusServiceImpl extends ServiceImpl<ActiveFullminusMappe
                 activeFullminusVO.setDieselUserLevel(str.split(","));
             }
             activeFullminusVO.setActiveDiscountChildList(activeDiscountChildList);
+            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
+            if (ObjectUtil.isNotEmpty(accountInfoById)) activeFullminusVO.setCreateBy(accountInfoById.getRealName());
             return activeFullminusVO;
         }).collect(Collectors.toList());
         page1.setRecords(activeFullminusVOList);