From 4dd1d899bf1a776e439d08da2617a7a33c656fd2 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 6 Jun 2025 10:29:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/OperateLog.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/v1/OperateLog.php b/app/admin/controller/v1/OperateLog.php
index 7134827d..219cfdb2 100644
--- a/app/admin/controller/v1/OperateLog.php
+++ b/app/admin/controller/v1/OperateLog.php
@@ -4,6 +4,7 @@ declare (strict_types = 1);
 namespace app\admin\controller\v1;
 
 use app\admin\model\v1\SysOperateLog;
+use app\admin\model\v1\SysUserModel;
 
 /**
  * 操作日志控制器
@@ -21,11 +22,15 @@ class OperateLog
             'size/d'
         ]);
 
-        $logs = SysOperateLog::hasWhere('user', function($query) use($param) {
+        $logs = SysOperateLog::field([
+                'SysOperateLog.*',
+                'SysUserModel.username'
+            ])
+            ->hasWhere('user', function($query) use($param) {
                 if (!empty($param['operator'])) {
-                    $query->where('username', 'like', "{$param['operator']}");
+                    $query->where('username', 'like', "%{$param['operator']}%");
                 }
-                $query->field(['id', 'username']);
+                $query->withTrashed()->field(['id', 'username']);
             })
             ->withSearch(['title', 'created_at'], [
                 'title'      => $param['title'] ?? null,
@@ -36,7 +41,6 @@ class OperateLog
                 'list_rows' => $param['size'] ?? 10,
                 'page'      => $param['page'] ?? 1,
             ])
-            ->bindAttr('user', ['username'])
             ->hidden(['user_id', 'user']);
 
         return success('获取成功', $logs);