peterguo 2 months ago
parent
commit
48640d98ff
1 changed files with 15 additions and 2 deletions
  1. 15 2
      app/Http/Controllers/API/DocumentController.php

+ 15 - 2
app/Http/Controllers/API/DocumentController.php

@@ -68,11 +68,24 @@ class DocumentController extends Controller
                 $data['asset_id'] = $model->asset_id;
                 $data['project_id'] = $model->project_id;
                 $data['type'] = $model->type;
+                break;
+            case ActionObjectType::PROJECT->value:
+                $data['project_id'] = $model->id;
+                $data['project_name'] = $model->name;
+                break;
+            case ActionObjectType::ASSET->value:
+                $data['asset_id'] = $model->id;
+                $data['asset_name'] = $model->name;
+                break;
             default:
                 break;
         }
-        $data['asset_name'] = $data['asset_id'] ? Asset::query()->findOrFail($data['asset_id'])->name : null;
-        $data['project_name'] = $data['project_id'] ? Project::query()->findOrFail($data['project_id'])->name : null;
+        if ($data['asset_id'] && ! $data['asset_name']) {
+            $data['asset_name'] = Asset::query()->findOrFail($data['asset_id'])->name;
+        }
+        if ($data['project_id'] && ! $data['project_name']) {
+            $data['project_name'] = Project::query()->findOrFail($data['project_id'])->name;
+        }
         return $this->success(['data' => $data]);
     }
 }