|
|
|
@ -80,7 +80,11 @@ class OperationLogController extends BaseController |
|
|
|
if ($request->has('name')) { |
|
|
|
$name = $request->input('name'); |
|
|
|
if (!empty($name)) { |
|
|
|
$user_id = AdminUsers::query()->where('username', $name)->value( |
|
|
|
$user_id = AdminUsers::query()->where( |
|
|
|
'username', |
|
|
|
'like', |
|
|
|
"%{$name}%" |
|
|
|
)->value( |
|
|
|
'id' |
|
|
|
); |
|
|
|
if ($user_id) { |
|
|
|
@ -131,7 +135,7 @@ class OperationLogController extends BaseController |
|
|
|
$total = $query->count(); |
|
|
|
$field = [ |
|
|
|
'id', 'user_id', 'action', 'description', 'sub_directory', |
|
|
|
'created_at' |
|
|
|
'created_at', 'old_values', 'new_values' |
|
|
|
]; |
|
|
|
$items = $query->latest()->forPage($page, $perPage)->select($field) |
|
|
|
->get()->each( |
|
|
|
@ -157,6 +161,12 @@ class OperationLogController extends BaseController |
|
|
|
} else { |
|
|
|
$item['sub_directory'] = ''; |
|
|
|
} |
|
|
|
if ($item['old_values']) { |
|
|
|
$item['old_values'] = json_encode($item['old_values']); |
|
|
|
} |
|
|
|
if ($item['new_values']) { |
|
|
|
$item['new_values'] = json_encode($item['new_values']); |
|
|
|
} |
|
|
|
unset($item['user_id']); |
|
|
|
return $item; |
|
|
|
} |
|
|
|
|