fix user_pswd can null

app/Http/Controllers/Admin/UserController.php

@@ -34,12 +34,27 @@ class UserController extends CommonController
     public function update($user_id)
     {
         $input = Input::except('_token','_method');
-        $input['pswd'] = Crypt::encrypt($input['pswd']);
-        $re = User::find($user_id)->update($input);
-        if($re){
-            return redirect('/user_list');
+        $rules = [
+            'name'=>'required',
+            'pswd'=>'required',
+            'surname'=>'required'
+        ];
+        $msg = [
+            'name.required'=>'登录名不能为空！',
+            'pswd.required'=>'密码不能为空！',
+            'surname.required'=>'姓名不能为空！'
+        ];
+        $validator = Validator::make($input,$rules,$msg);
+        if($validator->passes()){
+            $input['pswd'] = Crypt::encrypt($input['pswd']);
+            $re = User::find($user_id)->update($input);
+            if($re){
+                return redirect('/user_list');
+            }else{
+                return back()->with('errors','用户信息更新失败，请稍后重试!');
+            }
         }else{
-            return back()->with('errors','用户信息更新失败，请稍后重试!');
+            return back()->withErrors($validator);
         }
     }
 
@@ -52,7 +67,6 @@ class UserController extends CommonController
     public function store()
     {
         $input = Input::except('_token');
-        $input['pswd'] = Crypt::encrypt($input['pswd']);
         $input['display'] = '1';
 //        $input['status'] = '1';
         $rules = [
@@ -67,6 +81,7 @@ class UserController extends CommonController
         ];
         $validator = Validator::make($input,$rules,$msg);
         if($validator->passes()){
+            $input['pswd'] = Crypt::encrypt($input['pswd']);
             $re = User::create($input);
             if($re){
                 return redirect('/user_list');

resources/views/admin/user/edit.blade.php

@@ -144,14 +144,14 @@
                         </tr>
                         <tr>
                             <td>新密码</td>
-                            <td><input name="pswd" class="form-control" value=""></td>
+                            <td><input name="pswd" type="password" class="form-control" value=""></td>
                         </tr>
                         <tr>
                             <td>职位</td>
                             <td>
                                 <select class="form-control" name="role">
                                     @foreach($user_job as $value)
-                                        <option value="{{$value->id}}" @if($data->role == $value->id) selected @endif>{{$value->display_name}}</option>
+                                        <option value="{{$value->role}}" @if($data->role == $value->id) selected @endif>{{$value->display_name}}</option>
                                     @endforeach
                                 </select>
                             </td>

resources/views/layouts/admin.blade.php

@@ -84,6 +84,7 @@
                             <!-- User image -->
                             <li class="user-header">
                                 <img src="{{$user->thumb}}" class="img-circle" alt="User Image">
+                                <img src="ass" class="img-circle" alt="User Image">
 
                                 <p>
                                     {{ $user->thumb }}