From a0af42a6acfc7a0ebbb92bffc1816525e508af70 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 17 十月 2025 16:54:06 +0800 Subject: [PATCH] 修改bug --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java index c277960..6e52174 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java @@ -3,8 +3,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.system.dao.UserRedPacketRecordMapper; +import com.stylefeng.guns.modular.system.model.TBranchOffice; import com.stylefeng.guns.modular.system.model.UserRedPacketRecord; -import com.stylefeng.guns.modular.system.service.ITCompanyService; +import com.stylefeng.guns.modular.system.service.ITBranchOfficeService; import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.CellType; @@ -26,8 +27,8 @@ @Resource private UserRedPacketRecordMapper userRedPacketRecordMapper; - @Autowired - private ITCompanyService companyService; + @Resource + private ITBranchOfficeService branchOfficeService; /** @@ -82,7 +83,8 @@ list.add(time); list.add(""); list.add("运营商:"); - list.add(null != companyId ? companyService.selectById(companyId).getName() : ""); + TBranchOffice tBranchOffice = branchOfficeService.selectById(companyId); + list.add(null != tBranchOffice ? tBranchOffice.getBranchOfficeName() : ""); lists.add(list); list = new ArrayList<>(); list.add("时间"); @@ -221,7 +223,8 @@ list.add("起止时间:"); list.add(time); list.add("运营商:"); - list.add(null != companyId ? companyService.selectById(companyId).getName() : ""); + TBranchOffice tBranchOffice = branchOfficeService.selectById(companyId); + list.add(null != tBranchOffice ? tBranchOffice.getBranchOfficeName() : ""); lists.add(list); list = new ArrayList<>(); list.add("领取时间"); -- Gitblit v1.7.1