From b52041680d580aa774ee42173af4bd8c50b2dba5 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Sun, 18 May 2025 18:10:35 +0800
Subject: [PATCH] sth

---
 .../admin/controller/statistics/Dispatcher.php        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/statistics/Dispatcher.php b/application/admin/controller/statistics/Dispatcher.php
index ee00f12..5142399 100644
--- a/application/admin/controller/statistics/Dispatcher.php
+++ b/application/admin/controller/statistics/Dispatcher.php
@@ -77,6 +77,11 @@ class Dispatcher extends Backend
             }
         }
 
+        if(!empty($filter['admin_user'])){
+            $adminIds = Admin::where('username','like','%'.$filter['admin_user'].'%')->column('id');
+            $filter['admin_user_ids'] = $adminIds;
+        }
+
         $list = $this->chart($filter,false);
 
         $result = array("total" => $list->total(), "rows" => $list->items());
@@ -142,8 +147,8 @@ class Dispatcher extends Backend
             ->field($fields);
             //->where('dispatch_admin_id','>',0);
 
-        if(!empty($filter['admin_id'])){
-            $builder->where('dispatch_admin_id',$filter['admin_id']);
+        if(isset($filter['admin_user_ids'])){
+            $builder->whereIn('dispatch_admin_id',$filter['admin_user_ids']);
         }
 
         if(!empty($filter['start_time']) && !empty($filter['end_time'])){
@@ -186,7 +191,7 @@ class Dispatcher extends Backend
                 $datum->total_avg = $this->_calc($datum->total,$datum->finish_num,2);
 
                 if(!empty($datum->dispatch_admin_id)){
-                    $datum->admin_user = Admin::where($datum->dispatch_admin_id)->value('nickname')??'系统';
+                    $datum->admin_user = Admin::where('id',$datum->dispatch_admin_id)->value('nickname')??'系统';
                 }else{
                     $datum->admin_user = '系统';
                 }