diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java
index b95d139..a3899d6 100644
--- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java
+++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java
@@ -81,7 +81,7 @@ public class BssVatInvoiceController {
     @RequiresPermissions("bss:vatInvoice:edit")
     public String toEdit(@PathVariable("id") BssVatInvoice bssVatInvoice, Model model) {
         model.addAttribute("bssVatInvoice", bssVatInvoice);
-        return "/business/vatInvoice/add";
+        return "/business/vatInvoice/edit";
     }
 
     /**
@@ -196,16 +196,16 @@ public class BssVatInvoiceController {
             for (int i = 0; i < commodityNames.size(); i++) {
                 BssGoods good = new BssGoods();
                 good.setName(commodityNames.get(i).getWord());
-                if (ToolUtil.checkListSize(commodityTypes) && !StringUtil.isBlank(commodityTypes.get(i).getWord())) {
+                if (ToolUtil.checkListSize(commodityTypes) && commodityTypes.size() > i && !StringUtil.isBlank(commodityTypes.get(i).getWord())) {
                     good.setSpecification(commodityTypes.get(i).getWord());
                 }
-                if (ToolUtil.checkListSize(commodityUnits) && !StringUtil.isBlank(commodityUnits.get(i).getWord())) {
+                if (ToolUtil.checkListSize(commodityUnits) && commodityUnits.size() > i && !StringUtil.isBlank(commodityUnits.get(i).getWord())) {
                     good.setUnit(commodityUnits.get(i).getWord());
                 }
                 if (ToolUtil.checkListSize(commodityNums) && !StringUtil.isBlank(commodityNums.get(i).getWord())) {
                     good.setNum(Integer.valueOf(commodityNums.get(i).getWord()));
                 }
-                if (ToolUtil.checkListSize(commodityPrices) && !StringUtil.isBlank(commodityPrices.get(i).getWord())) {
+                if (ToolUtil.checkListSize(commodityPrices) && commodityPrices.size() > i && !StringUtil.isBlank(commodityPrices.get(i).getWord())) {
                     good.setUnitPrice(commodityPrices.get(i).getWord());
                 }
                 if (ToolUtil.checkListSize(commodityAmounts) && !StringUtil.isBlank(commodityAmounts.get(i).getWord())) {