From 53e0547c07ed4f4cf2f11ea670203daa87fe360c Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Thu, 30 Apr 2026 11:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AD=9B=E9=80=89=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/OperationLogController.php          | 19 +++++++++++++++++++
 app/Models/AdminMenu.php                      |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/app/Http/Controllers/Admin/OperationLogController.php b/app/Http/Controllers/Admin/OperationLogController.php
index cc22b02..133a1d6 100644
--- a/app/Http/Controllers/Admin/OperationLogController.php
+++ b/app/Http/Controllers/Admin/OperationLogController.php
@@ -115,6 +115,25 @@ class OperationLogController extends Controller
                 }
             }
 
+            if ($request->has('sub_directory')) {
+                $sub_directory = $request->input('sub_directory');
+                if (!empty($sub_directory)) {
+                    $query->where('sub_directory', '=', $sub_directory);
+                }
+            }
+
+            if ($request->has('main_directory')) {
+                $main_directory = $request->input('main_directory');
+                if (!empty($main_directory)) {
+                    $main_directory_arr = AdminMenu::getChildIds($main_directory);
+                    if ($main_directory_arr) {
+                        $query->whereIn('sub_directory', $main_directory_arr);
+                    } else {
+                        $query->where('id', 0);
+                    }
+                }
+            }
+
             // 分页
             $page = $request->input('page', 1);
             $perPage = $request->input('per_page', 10);
diff --git a/app/Models/AdminMenu.php b/app/Models/AdminMenu.php
index 2b4b4d1..e099da2 100644
--- a/app/Models/AdminMenu.php
+++ b/app/Models/AdminMenu.php
@@ -82,6 +82,11 @@ class AdminMenu extends Model
         return $value['title'];
     }
 
+    public static function getChildIds($id)
+    {
+        return self::query()->whereNull('deleted_at')->where('parent_id', $id)->pluck('id');
+    }
+
     /**
      * @param $value
      * @return string