diff --git a/erp_web/js/pages/manage/supplier.js b/erp_web/js/pages/manage/supplier.js
index 9ba584e5..e46a41ba 100644
--- a/erp_web/js/pages/manage/supplier.js
+++ b/erp_web/js/pages/manage/supplier.js
@@ -554,13 +554,15 @@
     //编辑信息
     function editSupplier(supplierTotalInfo) {
         var supplierInfo = supplierTotalInfo.split("AaBb");
+        var beginNeedGet = supplierInfo[5];
+        var beginNeedPay = supplierInfo[6];
         var row = {
             supplier : supplierInfo[1],
             contacts : supplierInfo[2].replace("undefined",""),
             phonenum : supplierInfo[3].replace("undefined",""),
             email : supplierInfo[4].replace("undefined",""),
-            BeginNeedGet : supplierInfo[5],
-            BeginNeedPay : supplierInfo[6],
+            BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet,
+            BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay,
             AllNeedGet: "",
             AllNeedPay: "",
             description : supplierInfo[8].replace("undefined",""),
@@ -602,7 +604,7 @@
                 supType: supType
             }),
             success: function(res){
-                if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) {
+                if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney !== "") {
                     var moneyA = res.data.rows.getAllMoney.toFixed(2)-0;
                     $.ajax({
                         type:"get",
@@ -615,7 +617,7 @@
                             supType: supType
                         }),
                         success: function(res){
-                            if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) {
+                            if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney !== "") {
                                 var moneyB = res.data.rows.getAllMoney.toFixed(2)-0;
                                 var money = moneyA+moneyB;
                                 var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收
diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
index e40d496f..ae2695d2 100644
--- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
+++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
@@ -120,6 +120,12 @@ public class SupplierService {
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int updateSupplier(String beanJson, Long id)throws Exception {
         Supplier supplier = JSONObject.parseObject(beanJson, Supplier.class);
+        if(supplier.getBeginneedpay() == null) {
+            supplier.setBeginneedpay(BigDecimal.ZERO);
+        }
+        if(supplier.getBeginneedget() == null) {
+            supplier.setBeginneedget(BigDecimal.ZERO);
+        }
         supplier.setId(id);
         int result=0;
         try{