|
@@ -52,12 +52,13 @@ class AdminHistory extends Controller
|
|
|
}
|
|
}
|
|
|
$result = $AdminHistoryModel
|
|
$result = $AdminHistoryModel
|
|
|
->where($map)
|
|
->where($map)
|
|
|
- ->select(['id', 'admin_uid', 'is_admin', 'module_menu_name', 'notes_type', 'general_description', 'insert_time'])
|
|
|
|
|
|
|
+ ->select(['id', 'admin_uid', 'is_admin','user_name','module_menu_name', 'notes_type', 'general_description', 'insert_time'])
|
|
|
->orderByDesc('id')
|
|
->orderByDesc('id')
|
|
|
->paginate($limit)->toarray();
|
|
->paginate($limit)->toarray();
|
|
|
if (isset($result['data']) && count($result['data']) > 0) {
|
|
if (isset($result['data']) && count($result['data']) > 0) {
|
|
|
foreach ($result['data'] as $key => $value) {
|
|
foreach ($result['data'] as $key => $value) {
|
|
|
$result['data'][$key]['username'] = $value['user_name'];
|
|
$result['data'][$key]['username'] = $value['user_name'];
|
|
|
|
|
+ unset($result['data'][$key]['user_name']);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
// 分配数据
|
|
// 分配数据
|
