系统日志导出3

app/Exports/OperationLogExport.php

@@ -23,16 +23,23 @@ class OperationLogExport implements FromArray, WithHeadings
             'created_at'
         ];
         $actionArr = AdminOperationLog::getActionArr();
-        AdminOperationLog::all($columns)->each(
+        AdminOperationLog::query()->orderBy('created_at', 'desc')->select(
+            $columns
+        )->take(1)->each(
             function ($item) use (&$data, &$index, $actionArr) {
+                if ($item['user_id']) {
                     $username = AdminUsers::getUsername($item['user_id']);
                     $item['operation_name'] = $username ?? '';
-                $item['action_str'] = $actionArr[$item['action']] ??
+                }
-                    $item['action'];
+                if (isset($actionArr[$item['action']])) {
+                    $item['action_str'] = $actionArr[$item['action']];
+                }
+                if ($item['description']) {
                     $description = __('log.' . $item['description']);
                     if (strpos($description, 'log.') === false) {
                         $item['description'] = $description;
                     }
+                }
                 $item['main_directory'] = '';
                 if ($item['sub_directory']) {
                     $item['main_directory']
@@ -47,13 +54,13 @@ class OperationLogExport implements FromArray, WithHeadings
                 }
                 $data[] = [
                     'id'             => $index,
-                    'created_at'     => $item['created_at'],
+                    'created_at'     => $item['created_at'] ?? '',
-                    'operation_name' => $item['operation_name'],
+                    'operation_name' => $item['operation_name'] ?? '',
-                    'main_directory' => $item['main_directory'],
+                    'main_directory' => $item['main_directory'] ?? '',
-                    'sub_directory'  => $item['sub_directory'],
+                    'sub_directory'  => $item['sub_directory'] ?? '',
-                    'action'         => $item['action'],
+                    'action'         => $item['action'] ?? '',
-                    'action_str'     => $item['action_str'],
+                    'action_str'     => $item['action_str'] ?? '',
-                    'description'    => $item['description'],
+                    'description'    => $item['description'] ?? '',
                 ];
                 $index += 1;
             }

app/Models/AdminMenu.php

@@ -68,7 +68,9 @@ class AdminMenu extends Model
     public static function getLastParentTitle($parent_id): string
     {
         $last_parent_id = self::query()->where('id', $parent_id)->whereNull('deleted_at')->value('parent_id');
+        if ($last_parent_id) {
             $title = self::getTreeTitle($last_parent_id);
+        }
         return empty($title) ? '' : __('menu.' . $title);
     }