Fixed #16388, part 2

Author: brandonkelly

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Fixed a bug where the Login Page Logo general setting had inaccurate instructions. ([#16482](https://github.com/craftcms/cms/issues/16482))
 - Fixed a bug where element indexes’ View menus could have a horizontal scrollbar. ([#16473](https://github.com/craftcms/cms/issues/16473))
 - Fixed a bug where info icons weren’t shown within slideouts.
+- Fixed a bug where the `utils/delete-empty-volume-folders` command was deleting folders that had no assets directly, but had subfolders. ([#16388](https://github.com/craftcms/cms/issues/16388))
 
 ## 5.6.0.2 - 2025-01-21
 

src/console/controllers/utils/DeleteEmptyVolumeFoldersController.php

@@ -48,7 +48,11 @@ public function actionIndex(): int
             ->select(['folders.id'])
             ->from(['folders' => Table::VOLUMEFOLDERS])
             ->leftJoin(['assets' => Table::ASSETS], '[[assets.folderId]] = [[folders.id]]')
-            ->where(['assets.id' => null])
+            ->leftJoin(['subfolders' => Table::VOLUMEFOLDERS], '[[subfolders.parentId]] = [[folders.id]]')
+            ->where([
+                'assets.id' => null,
+                'subfolders.id' => null,
+            ])
             ->andWhere(['not', ['folders.parentId' => null]])
             ->andWhere(['not', ['folders.path' => null]]);