代码整理

app/Http/Controllers/Admin/UserController.php

@@ -42,11 +42,9 @@ class UserController extends CommonController
 
         $validator = Validator::make(Input::except('_token', '_method'), [
             'name' => 'required',
-            'pswd' => 'required',
             'surname' => 'required'
         ], [
             'name.required' => '登录名不能为空！',
-            'pswd.required' => '密码不能为空！',
             'surname.required' => '姓名不能为空！'
         ]);
 
@@ -56,14 +54,12 @@ class UserController extends CommonController
         $input['role'] = $job_role->role;
         $input['job_name'] = $job_role->display_name;
 
-        $input['pswd'] = Crypt::encrypt($input['pswd']);
+        if($input['pswd'] != '')$input['pswd'] =  Crypt::encrypt($input['pswd']);
 
-
-        if (!User::find($user_id)->update($input)) return back()->with('errors', '用户信息更新失败，请稍后重试!');
+        if (!User::find($user_id)->update($input)) return back()->withErrors('用户信息更新失败，请稍后重试!');
 
         return redirect('/user_list');
 
-
     }
 
     public function create()