From 77d60c1520b63deaae7cde8919a1335271fcb11f Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 26 Nov 2021 15:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/controller/backend/AccountController.java  | 4 ++--
 src/main/resources/templates/admin/account_input.ftl          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/AccountController.java b/src/main/java/cn/palmte/work/controller/backend/AccountController.java
index 49f931b..aba1695 100644
--- a/src/main/java/cn/palmte/work/controller/backend/AccountController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/AccountController.java
@@ -139,8 +139,8 @@ public class AccountController extends BaseController {
 
             accountService.saveOrUpdateAccount(userId, admin.getRoleId(), admin, privateKey);
         } catch (Exception e) {
-            logger.error("保存账号出错！" + e.toString());
-            return "新增账号出错!请联系管理员处理！";
+            model.put("errorMessage", "保存账号出错！请联系管理员处理");
+            return "/common/error";
         }
         return "redirect:/account/list";
     }
diff --git a/src/main/resources/templates/admin/account_input.ftl b/src/main/resources/templates/admin/account_input.ftl
index d10a2aa..6de4ed8 100644
--- a/src/main/resources/templates/admin/account_input.ftl
+++ b/src/main/resources/templates/admin/account_input.ftl
@@ -129,7 +129,7 @@
                                     <input name="directManager" class="js-ajax-validate"
                                            data-validate-async data-validation-message="请输入直接主管"
                                            type="text" id="directManager" value="${account.directManager!}"
-                                           minlength="1" maxlength="20"  <#if userId!=-1>readonly</#if>
+                                           minlength="1" maxlength="10"  <#if userId!=-1>readonly</#if>
                                            required placeholder="请输入直接主管"/>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>