diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index 7594c9656..040eb5958 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -84,9 +84,6 @@ class User extends Controller
     /**
      * 修改用户密码
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function pass()
     {
@@ -101,8 +98,8 @@ class User extends Controller
                 'repassword.require'          => '重复密码不能为空！',
                 'repassword.confirm:password' => '两次输入的密码不一致！',
             ]);
-            $user = SystemUser::mk()->find($data['id']);
-            if (!empty($user) && $user->save(['password' => md5($data['password'])])) {
+            $user = SystemUser::mk()->findOrEmpty($data['id']);
+            if ($user->isExists() && $user->save(['password' => md5($data['password'])])) {
                 sysoplog('系统用户管理', "修改用户[{$data['id']}]密码成功");
                 $this->success('密码修改成功，请使用新密码登录！', '');
             } else {
diff --git a/app/admin/view/file/form.html b/app/admin/view/file/form.html
deleted file mode 100644
index 79ea76eeb..000000000
--- a/app/admin/view/file/form.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card" data-table-id="UserTable">
-    <div class="layui-card-body padding-left-40">
-
-        <fieldset class="layui-bg-gray">
-            <legend><b class="layui-badge think-bg-violet">用户账号</b></legend>
-
-            <div class="layui-row layui-col-space15">
-                <div class="layui-col-xs2 text-center padding-top-15">
-                    <input type="hidden" name="headimg" value="{$vo.headimg|default=''}">
-                    <script>$('[name=headimg]').uploadOneImage();</script>
-                </div>
-                <div class="layui-col-xs5">
-                    <label class="block relative">
-                        <span class="help-label"><b>登录账号</b>User Name</span>
-                        {if isset($vo) and isset($vo.username)}
-                        <input disabled value='{$vo.username|default=""}' required class="layui-input think-bg-gray">
-                        {else}
-                        <input name="username" value='{$vo.username|default=""}' required pattern="^.{4,}$" placeholder="请输入登录账号" class="layui-input">
-                        {/if}
-                        <span class="help-block">登录账号不能重复并且创建后不能再次修改哦。</span>
-                    </label>
-                </div>
-                <div class="layui-col-xs5">
-                    <label class="block relative">
-                        <span class="help-label"><b>用户名称</b>Nick Name</span>
-                        <input name="nickname" value='{$vo.nickname|default=""}' required placeholder="请输入用户名称" class="layui-input">
-                        <span class="help-block">用于区分用户数据的用户名称，请尽量不要重复。</span>
-                    </label>
-                </div>
-            </div>
-
-        </fieldset>
-
-        {if !empty($bases) || !empty($authorizes)}
-        <fieldset class="layui-bg-gray">
-            <legend><b class="layui-badge think-bg-violet">用户权限</b></legend>
-            {if !empty($bases)}
-            <div class="layui-form-item">
-                <div class="help-label"><b>角色身份</b>Role Identity</div>
-                <div class="layui-textarea help-checks">
-                    {foreach $bases as $base}
-                    <label class="think-checkbox">
-                        {if isset($vo.usertype) and $vo.usertype eq $base.code}
-                        <input type="radio" checked name="usertype" value="{$base.code}" lay-ignore>{$base.name}
-                        {else}
-                        <input type="radio" name="usertype" value="{$base.code}" lay-ignore>{$base.name}
-                        {/if}
-                    </label>
-                    {/foreach}
-                </div>
-            </div>
-            {/if}
-            {if !empty($authorizes)}
-            <div class="layui-form-item">
-                <div class="help-label"><b>访问权限</b>Role Permission</div>
-                <div class="layui-textarea help-checks">
-                    {if isset($vo.username) and $vo.username eq $superName}
-                    <span class="color-desc padding-left-5">超级用户拥所有访问权限，不需要配置权限。</span>
-                    {else}{foreach $authorizes as $authorize}
-                    <label class="think-checkbox">
-                        {if in_array($authorize.id, $vo.authorize)}
-                        <input type="checkbox" checked name="authorize[]" value="{$authorize.id}" lay-ignore>{$authorize.title}
-                        {else}
-                        <input type="checkbox" name="authorize[]" value="{$authorize.id}" lay-ignore>{$authorize.title}
-                        {/if}
-                    </label>
-                    {/foreach}{/if}
-                </div>
-            </div>
-            {/if}
-        </fieldset>
-        {/if}
-
-        <fieldset class="layui-bg-gray">
-            <legend><b class="layui-badge think-bg-violet">用户资料</b></legend>
-            <div class="layui-row layui-col-space15">
-                <div class="layui-col-xs4">
-                    <label class="relative block">
-                        <span class="help-label"><b>联系邮箱</b>Contact Email</span>
-                        <input name="contact_mail" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.contact_mail|default=""}' placeholder="请输入联系电子邮箱" class="layui-input">
-                        <span class="color-desc">可选，请填写用户常用的电子邮箱</span>
-                    </label>
-                </div>
-                <div class="layui-col-xs4">
-                    <label class="relative block">
-                        <span class="help-label"><b>联系手机</b>Contact Mobile</span>
-                        <input type="tel" maxlength="11" name="contact_phone" value='{$vo.contact_phone|default=""}' pattern="^1[3-9][0-9]{9}$" placeholder="请输入用户联系手机" class="layui-input">
-                        <span class="color-desc">可选，请填写用户常用的联系手机号</span>
-                    </label>
-                </div>
-                <div class="layui-col-xs4">
-                    <label class="relative block">
-                        <span class="help-label"><b>联系ＱＱ</b>Contact QQ</span>
-                        <input name="contact_qq" pattern="^\d{6,}$" value='{$vo.contact_qq|default=""}' placeholder="请输入常用的联系ＱＱ" class="layui-input">
-                        <span class="color-desc">可选，请填写用户常用的联系ＱＱ号</span>
-                    </label>
-                </div>
-            </div>
-            <label class="layui-form-item block relative margin-top-10">
-                <span class="help-label"><b>用户描述</b>User Remark</span>
-                <textarea placeholder="请输入用户描述" class="layui-textarea" name="describe">{$vo.describe|default=""}</textarea>
-            </label>
-        </fieldset>
-
-    </div>
-
-    <div class="hr-line-dashed"></div>
-    {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
-    <div class="layui-form-item text-center">
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
-    </div>
-</form>
\ No newline at end of file