From da798323db8d63bf4fc87591233e3dc9351fb3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 22 Jan 2017 23:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=9A=84=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/action/basic/AccountAction.class  | Bin 13179 -> 13298 bytes
 WebRoot/pages/manage/account.jsp              |   2 +-
 src/com/jsh/action/basic/AccountAction.java   |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class
index 5852e80aff58c76588e48e9243730c31a49558fb..161572a9390bb3deff4f67436a43c4e74beb636d 100644
GIT binary patch
delta 5230
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

delta 5162
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
GWB&u?D6|s*

diff --git a/WebRoot/pages/manage/account.jsp b/WebRoot/pages/manage/account.jsp
index 10eeac958..4d1741538 100644
--- a/WebRoot/pages/manage/account.jsp
+++ b/WebRoot/pages/manage/account.jsp
@@ -74,7 +74,7 @@
                 </div>
                 <div class="fitem" style="padding:5px">
                     <label id="currentAmountLabel">当前余额</label>
-                    <input name="currentAmount" id="currentAmount" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px"></input>
+                    <input name="currentAmount" id="currentAmount" type="text" disabled="disabled" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px"></input>
                 </div>
                 <div class="fitem" style="padding:5px">
                     <label id="remarkLabel">备&nbsp;&nbsp;&nbsp;&nbsp;注</label>
diff --git a/src/com/jsh/action/basic/AccountAction.java b/src/com/jsh/action/basic/AccountAction.java
index 8a7ea06f4..768a04cd1 100644
--- a/src/com/jsh/action/basic/AccountAction.java
+++ b/src/com/jsh/action/basic/AccountAction.java
@@ -64,7 +64,7 @@ public class AccountAction extends BaseAction<AccountModel>
             Account Account = new Account();
             Account.setName(model.getName());
             Account.setSerialNo(model.getSerialNo());
-            Account.setInitialAmount(model.getInitialAmount());
+            Account.setInitialAmount(model.getInitialAmount()!=null ? model.getInitialAmount() : 0);
             Account.setCurrentAmount(model.getCurrentAmount());
             Account.setRemark(model.getRemark());
             accountService.create(Account);
@@ -139,7 +139,7 @@ public class AccountAction extends BaseAction<AccountModel>
             Account Account = accountService.get(model.getAccountID());
             Account.setName(model.getName());
             Account.setSerialNo(model.getSerialNo());
-            Account.setInitialAmount(model.getInitialAmount());
+            Account.setInitialAmount(model.getInitialAmount()!=null ? model.getInitialAmount() : 0);
             Account.setCurrentAmount(model.getCurrentAmount());
             Account.setRemark(model.getRemark());
             accountService.update(Account);