From 8940b6e846989597c834ea8148c2634360fca58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com>
Date: Tue, 3 May 2022 17:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAexcel=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/MaterialController.java    | 24 +++++++++----------
 .../java/com/jsh/erp/utils/StringUtil.java    |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index e3254d68..9c752b38 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -303,18 +303,18 @@ public class MaterialController {
      */
     @GetMapping(value = "/exportExcel")
     @ApiOperation(value = "生成excel表格")
-    public void exportExcel(@RequestParam("categoryId") String categoryId,
-                            @RequestParam("barCode") String barCode,
-                            @RequestParam("name") String name,
-                            @RequestParam("standard") String standard,
-                            @RequestParam("model") String model,
-                            @RequestParam("color") String color,
-                            @RequestParam("weight") String weight,
-                            @RequestParam("expiryNum") String expiryNum,
-                            @RequestParam("enableSerialNumber") String enableSerialNumber,
-                            @RequestParam("enableBatchNumber") String enableBatchNumber,
-                            @RequestParam("remark") String remark,
-                            @RequestParam("mpList") String mpList,
+    public void exportExcel(@RequestParam(value = "categoryId", required = false) String categoryId,
+                            @RequestParam(value = "barCode", required = false) String barCode,
+                            @RequestParam(value = "name", required = false) String name,
+                            @RequestParam(value = "standard", required = false) String standard,
+                            @RequestParam(value = "model", required = false) String model,
+                            @RequestParam(value = "color", required = false) String color,
+                            @RequestParam(value = "weight", required = false) String weight,
+                            @RequestParam(value = "expiryNum", required = false) String expiryNum,
+                            @RequestParam(value = "enableSerialNumber", required = false) String enableSerialNumber,
+                            @RequestParam(value = "enableBatchNumber", required = false) String enableBatchNumber,
+                            @RequestParam(value = "remark", required = false) String remark,
+                            @RequestParam(value = "mpList", required = false) String mpList,
                             HttpServletRequest request, HttpServletResponse response) {
         try {
             String[] mpArr = new String[]{};
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
index 6f5ba8b0..bf1cc3fc 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
@@ -254,7 +254,7 @@ public class StringUtil {
     }
 
     public static String toNull(String value) {
-        if(("").equals(value)) {
+        if(isEmpty(value)) {
             value = null;
         } else {
             value = value.trim();