2023年1月4日10:24:11

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehousebillsfeesController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -142,10 +143,12 @@ public class TWarehousebillsfeesController extends BaseController {
     @GetMapping("/queryMenuExport")
     public AjaxResult queryMenuExport(TWarehousebillsfees tWarehousebillsfees) {
         String excelName = "";
-        if (tWarehousebillsfees.getfDc().equals("D")) {
-            excelName = "账单明细-收";
-        } else if (tWarehousebillsfees.getfDc().equals("C")) {
-            excelName = "账单明细-付";
+        if (ObjectUtils.isNotNull(tWarehousebillsfees.getfDc())){
+            if (tWarehousebillsfees.getfDc().equals("D")) {
+                excelName = "账单明细-收";
+            } else if (tWarehousebillsfees.getfDc().equals("C")) {
+                excelName = "账单明细-付";
+            }
         }
         List<QueryMenu> list = tWarehousebillsfeesService.selectQueryMenuList(tWarehousebillsfees);
         ExcelUtil<QueryMenu> util = new ExcelUtil<>(QueryMenu.class);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehousebillsfeesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.service.impl;
 
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -209,6 +210,9 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
         // 创建 workbook，对应一个 excel 文件
         HSSFWorkbook wb = new HSSFWorkbook();
         // 在 workbook 中添加一个sheet，对应 excel 文档中的 sheet
+        if (ObjectUtils.isNull(excelName)){
+            excelName = "账单明细-分项-收付";
+        }
         HSSFSheet sheet = wb.createSheet(excelName);;
         // 获取 cell 样式
         HSSFCellStyle cellTitleStyle = getCellStyle(wb, "center", true);