|
|
|
@ -32,7 +32,7 @@ class OtherController extends CommonController
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$all = \request()->all();
|
|
|
|
$all = \request()->all();
|
|
|
|
$show_all = request('show_all', 0);
|
|
|
|
$show_all = request('show_all', 0);
|
|
|
|
$list = Admin::where(function ($query) use ($all, $show_all) {
|
|
|
|
$list = Admin::with('department')->where(function ($query) use ($all, $show_all) {
|
|
|
|
if (isset($all['department_id'])) {
|
|
|
|
if (isset($all['department_id'])) {
|
|
|
|
$query->where('department_id', $all['department_id']);
|
|
|
|
$query->where('department_id', $all['department_id']);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|