github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-18 03:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 移动文件夹内文件所有者不变的问题

Browse Source
This commit is contained in:
kuaifan 2022-07-05 12:59:50 +08:00
parent c3cccbb2c8
commit 8eb956f831
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/FileController.php
View File

@ -359,7 +359,7 @@ class FileController extends AbstractController
*/ */
public function move() public function move()
{ {
User::auth(); $user = User::auth();
// //
$ids = Request::input('ids'); $ids = Request::input('ids');
$pid = intval(Request::input('pid')); $pid = intval(Request::input('pid'));
@ -377,7 +377,7 @@ class FileController extends AbstractController
} }
// //
$files = []; $files = [];
AbstractModel::transaction(function() use ($pid, $ids, $toShareFile, &$files) { AbstractModel::transaction(function() use ($user, $pid, $ids, $toShareFile, &$files) {
foreach ($ids as $id) { foreach ($ids as $id) {
$file = File::permissionFind($id, 1000); $file = File::permissionFind($id, 1000);
// //
@ -390,6 +390,7 @@ class FileController extends AbstractController
throw new ApiException("{$file->name} 内含有共享文件，无法移动到另一个共享文件夹内"); throw new ApiException("{$file->name} 内含有共享文件，无法移动到另一个共享文件夹内");
} }
$file->userid = $toShareFile->userid; $file->userid = $toShareFile->userid;
File::where('pids', 'LIKE', "%,{$file->id},%")->update(['userid' => $toShareFile->userid]);
} }
// //
$tmpId = $pid; $tmpId = $pid;
@ -399,6 +400,9 @@ class FileController extends AbstractController
} }
$tmpId = intval(File::whereId($tmpId)->value('pid')); $tmpId = intval(File::whereId($tmpId)->value('pid'));
} }
} else {
$file->userid = $user->userid;
File::where('pids', 'LIKE', "%,{$file->id},%")->update(['userid' => $user->userid]);
} }
// //
$file->pid = $pid; $file->pid = $pid;