From ddffc0d33c5bf1bd0806b688ef76081f23b16051 Mon Sep 17 00:00:00 2001
From: todaywindy <hant@cherrybless.com>
Date: Thu, 3 Jul 2025 11:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/workers/Worker.php           | 8 +++++++-
 .../common/command/CheckOrderDispatchGotCommand.php       | 1 +
 public/assets/js/backend/orders/dispatch.js               | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/workers/Worker.php b/application/admin/controller/workers/Worker.php
index eae13a4..5c802f2 100644
--- a/application/admin/controller/workers/Worker.php
+++ b/application/admin/controller/workers/Worker.php
@@ -303,7 +303,7 @@ class Worker extends Backend
             ->select();
         $select_ids = array_column($select_ids, 'item_id');
         foreach ($this->tree as $index => $item) {
-            if (in_array($item['parent'], $select_ids)) {
+            if (in_array($item['parent'], $select_ids)||in_array($item['id'],$select_ids)) {
                 $this->tree[$index]['state']['selected'] = true;
             }
         }
@@ -319,6 +319,7 @@ class Worker extends Backend
     {
         $area_id = request()->get('area_id');
         $item_id = request()->get('item_id');
+        $keyword = request()->get('keyword');
         list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
         $build = model('worker')
@@ -343,12 +344,17 @@ class Worker extends Backend
 //            dd($code);
             $build->where('area_id', 'like', $code . '%');
         }
+
         if ($item_id) {
             $ids = $this->getParentIdsFromArray($item_id,$this->items);
             $ids [] = $item_id;
             $worker_ids =  WorkerItem::whereIn('item_id',$ids)->column('worker_id');
             $build->whereIn('id',$worker_ids);
         }
+        if ($keyword) {
+            $build->where('name', 'like', '%'.$keyword . '%')
+                ->whereOr('tel','like','%'.$keyword . '%');
+        }
         $list = $build
             ->paginate($limit);
         $result = array("total" => $list->total(), "rows" => $list->items());
diff --git a/application/common/command/CheckOrderDispatchGotCommand.php b/application/common/command/CheckOrderDispatchGotCommand.php
index 6a21276..2581e7e 100644
--- a/application/common/command/CheckOrderDispatchGotCommand.php
+++ b/application/common/command/CheckOrderDispatchGotCommand.php
@@ -44,6 +44,7 @@ class CheckOrderDispatchGotCommand extends Command
 
             $Model->where('status', OrderDispatch::STATUS_TOGET)
                 ->where('type', 2)
+                ->where('worker_id','!=',1059)
                 ->where('create_time', '<=', $now)
                 ->chunk(100, function ($list) use ($OrderLogic) {
                     foreach ($list as $item) {
diff --git a/public/assets/js/backend/orders/dispatch.js b/public/assets/js/backend/orders/dispatch.js
index 2a60caa..4649485 100644
--- a/public/assets/js/backend/orders/dispatch.js
+++ b/public/assets/js/backend/orders/dispatch.js
@@ -352,7 +352,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'layer', 'cascader'],
                         Form.api.submit($("#add-form"), function (data) {
                             var index = parent.Layer.getFrameIndex(window.name);
                             parent.Layer.close(index); // 关闭当前弹窗
-                            parent.table.bootstrapTable('refresh'); // 刷新父页面表格
                         });
                     } else {
                         Toastr.error('请完整填写表单');