| xqd
@@ -33,7 +33,9 @@ class UserController extends CommonController
|
|
|
|
|
|
$user_job = Job::where('display', '=', '1')->orderby('role', 'asc')->get();
|
|
|
|
|
|
- return view('admin.user.edit', ['data' => $data, 'user_job' => $user_job]);
|
|
|
+ $department = Department::where('display', '=', '1')->get();
|
|
|
+
|
|
|
+ return view('admin.user.edit', ['data' => $data, 'user_job' => $user_job,'department'=>$department]);
|
|
|
|
|
|
}
|
|
|
|
| xqd
@@ -48,6 +50,8 @@ class UserController extends CommonController
|
|
|
$input['job_name'] = $job_role->display_name;
|
|
|
$input['pswd'] = Crypt::encrypt($input['pswd']);
|
|
|
|
|
|
+ !$input['department_id']?$input['department'] =' ':$input['department'] = Department::find($input['department_id'])->department_name;
|
|
|
+
|
|
|
if (!User::find($user_id)->update($input)) return back()->withErrors('用户信息更新失败,请稍后重试!');
|
|
|
|
|
|
$sesson_user = session('user');
|