peterguo 2 months ago
parent
commit
10c21bf0fb
1 changed files with 4 additions and 1 deletions
  1. 4 1
      app/Services/Folder/FoldersService.php

+ 4 - 1
app/Services/Folder/FoldersService.php

@@ -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' => []]);
         });
     }