|
@@ -14,6 +14,9 @@ class FoldersService
|
|
|
{
|
|
|
$folder = Folder::query()->findOrFail($id);
|
|
|
$namingRule = NamingRule::query()->findOrFail($namingRuleId);
|
|
|
+ if ($folder->naming_rule_id == $namingRule->id) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
// 子孙均需更新
|
|
|
DB::transaction(function () use ($folder, $namingRule) {
|
|
|
Folder::query()
|
|
@@ -23,7 +26,7 @@ class FoldersService
|
|
|
File::query()
|
|
|
->join('folders', 'files.folder_id', '=', 'folders.id')
|
|
|
->where('folders.path', 'like', $folder->path . '%')
|
|
|
- ->update(['files.naming_rule_id' => $namingRule->id]);
|
|
|
+ ->update(['files.naming_rule_id' => $namingRule->id, 'naming_rules' => []]);
|
|
|
});
|
|
|
}
|
|
|
|