blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-05-25 07:18:10 +08:00
Code Issues Projects Releases Wiki Activity

fix: 修复重复文件清理处理

Browse Source
This commit is contained in:
Anyon 2025-11-19 16:56:35 +08:00
parent d00ad29f7b
commit ed5cbd1478
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/admin/controller/File.php
View File

@ -109,8 +109,12 @@ class File extends Controller
public function distinct() public function distinct()
{ {
$map = ['issafe' => 0, 'uuid' => AdminService::getUserId()]; $map = ['issafe' => 0, 'uuid' => AdminService::getUserId()];
$subQuery = SystemFile::mk()->fieldRaw('MAX(id) AS id')->where($map)->group('type, xkey')->buildSql(); // 使用派生表包装子查询，避免直接引用同一表
SystemFile::mk()->where($map)->whereRaw("id NOT IN ({$subQuery})")->delete(); $keepSubQuery = SystemFile::mk()->fieldRaw('MAX(id) AS id')->where($map)->group('type, xkey')->buildSql();
// 使用 whereNotExists 配合派生表子查询删除，避免 1093 错误和 whereIn
SystemFile::mk()->where($map)->whereNotExists(function ($query) use ($keepSubQuery) {
$query->table("({$keepSubQuery})")->alias('f2')->whereRaw('f2.id = system_file.id');
})->delete();
$this->success('清理重复文件成功！'); $this->success('清理重复文件成功！');
} }
} }