Browse Source

file history

peterguo 1 month ago
parent
commit
c9643d47e9

+ 1 - 1
app/Repositories/ContainerFileRepository.php

@@ -12,7 +12,7 @@ class ContainerFileRepository
         return File::query()
             ->where('object_type', $file->object_type)
             ->where('object_id', $file->object_id)
-            ->where("title", $file->title)
+            ->where("source_file_id", $file->source_file_id)
             ->where("folder_id", $file->folder_id)
             ->get();
     }

+ 10 - 0
app/Services/File/Upload/FilesUploadTrait.php

@@ -163,6 +163,16 @@ trait FilesUploadTrait
             $fileArr['version'] = $version + 1;
             $fileArr['is_latest_version'] = 1;
 
+            $firstFile = File::query()
+                ->where('object_type', $fileArr['object_type'])
+                ->where('object_id', $fileArr['object_id'])
+                ->where("title", $fileArr['title'])
+                ->where("source", 1)
+                ->where("folder_id", $fileArr['folder_id'] ?? 0)
+                ->first();
+
+            $fileArr['source_file_id'] = $firstFile?->id;
+
             File::query()
                 ->where('object_type', $fileArr['object_type'])
                 ->where('object_id', $fileArr['object_id'])