diff --git a/src/main/java/com/jsh/action/basic/AccountAction.java b/src/main/java/com/jsh/action/basic/AccountAction.java
index 747cb4d1..80203fce 100644
--- a/src/main/java/com/jsh/action/basic/AccountAction.java
+++ b/src/main/java/com/jsh/action/basic/AccountAction.java
@@ -305,7 +305,10 @@ public class AccountAction extends BaseAction<AccountModel>
                     item.put("initialAmount", account.getInitialAmount());
                     String monthTime = Tools.getCurrentMonth();
                     Double thisMonthAmount = getAccountSum(account.getId(), monthTime) + getAccountSumByHead(account.getId(), monthTime) +getAccountSumByDetail(account.getId(), monthTime);
-                    String thisMonthAmountFmt=df.format(thisMonthAmount);
+                    String thisMonthAmountFmt = "0";
+                    if(thisMonthAmount!=0){
+                        thisMonthAmountFmt = df.format(thisMonthAmount);
+                    }
                     item.put("thisMonthAmount", thisMonthAmountFmt);  //本月发生额
                     Double currentAmount = getAccountSum(account.getId(),"") + getAccountSumByHead(account.getId(), "") + getAccountSumByDetail(account.getId(), "") + account.getInitialAmount();
                     String currentAmountFmt=df.format(currentAmount);
diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java
index f5786a1b..737f38b4 100644
--- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java
+++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java
@@ -194,7 +194,12 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 			if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
 			if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
 			depotHead.setSalesman(model.getSalesman());
-			if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));}			
+			if(model.getAccountId()!=null){
+				depotHead.setAccountId(new Account(model.getAccountId()));
+			}
+			else {
+				depotHead.setAccountId(null);
+			}
 			depotHead.setChangeAmount(model.getChangeAmount());
 			depotHead.setAccountIdList(model.getAccountIdList());
 			depotHead.setAccountMoneyList(model.getAccountMoneyList());