peterguo преди 5 дни
родител
ревизия
df976efab9
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 2 2
      app/Http/Controllers/API/FileController.php
  2. 1 0
      app/Http/Resources/API/FileByObjectResource.php

+ 2 - 2
app/Http/Controllers/API/FileController.php

@@ -355,7 +355,7 @@ class FileController extends Controller
         $fileId = (int) ($inputArr['file_id'] ?? 0);
         $pageSize = (int) $request->get('page_size', 10);
 
-        $file = File::query()->findOrFail($fileId);
+        $file = File::query()->with(['bimFile', 'createdBy'])->findOrFail($fileId);
 
         if (!empty($file->source_file_id)) {
             $files = File::query()
@@ -372,7 +372,7 @@ class FileController extends Controller
             $files[] = $file;
         }
 
-        return FileSimpleResource::collection($files);
+        return FileByObjectResource::collection($files);
     }
 
     // 文件详情

+ 1 - 0
app/Http/Resources/API/FileByObjectResource.php

@@ -37,6 +37,7 @@ class FileByObjectResource extends JsonResource
             'naming_rules' => $this->naming_rules,
             'doc_stage' => $this->doc_stage,
             'doc_type' => $this->doc_type,
+            'bim_file' => $this->bimFile ? new BimFileResource($this->bimFile) : null,
         ];
 
         if ($this->is_bim == 1 && $this->bimFile && $this->bimFile->convert_status == BimFileConvertStatus::DONE->value) {