From c854518581b5b176aa2c5aa459a4fda6c985fca6 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 14 Mar 2025 09:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/controller/api/auth/Ticket.php                      | 6 +++++-
 .../src/model/InspectionStaffToken.php                      | 2 +-
 plugs/think-plugs-ticket/src/model/TicketTicket.php         | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php b/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php
index 37c8b6d..0e5a0d7 100644
--- a/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php
+++ b/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php
@@ -63,11 +63,15 @@ class Ticket extends Auth
 
     public function list()
     {
+        $query = TicketTicket::query()->scope(['avail'])->where(['fz_user_id'=>$this->staff->id]);
         $status = $this->request->get('status', null);
-        $query = TicketTicket::query(); // ->where(['fz_user_id'=>$this->staff->id])
         if ($status) {
             $query->where('staff_status', $status);
         }
+        $keyword = $this->request->get('keyword', null);
+        if ($keyword) {
+            $query->where('title', 'like', "%{$keyword}%");
+        }
         $pageData = $query->paginate();
         $this->success('获取工单列表', $pageData);
     }
diff --git a/plugs/think-plugs-inspection/src/model/InspectionStaffToken.php b/plugs/think-plugs-inspection/src/model/InspectionStaffToken.php
index 1ecbd3d..a0c2505 100644
--- a/plugs/think-plugs-inspection/src/model/InspectionStaffToken.php
+++ b/plugs/think-plugs-inspection/src/model/InspectionStaffToken.php
@@ -8,6 +8,6 @@ class InspectionStaffToken extends Model
 {
     public function staff()
     {
-        return $this->belongsTo(InspectionStaff::class, 'staff_id');
+        return $this->belongsTo(InspectionStaff::class, 'staff_id', "id");
     }
 }
\ No newline at end of file
diff --git a/plugs/think-plugs-ticket/src/model/TicketTicket.php b/plugs/think-plugs-ticket/src/model/TicketTicket.php
index b7251f2..ce24030 100644
--- a/plugs/think-plugs-ticket/src/model/TicketTicket.php
+++ b/plugs/think-plugs-ticket/src/model/TicketTicket.php
@@ -8,7 +8,6 @@ use think\admin\Model;
 class TicketTicket extends Model
 {
     protected $append = ['status_text', 'type_name', 'dept_name', 'imgs_arr'];
-    protected $globalScope = ['unConf'];
     protected $table = 'ticket_ticket';
     public function type()
     {
@@ -90,7 +89,7 @@ class TicketTicket extends Model
     private function getStatusList()
     {
         return [
-            -1 => '已关闭',
+            -1 => '待审核',
             0 => '待处理',
             1 => '已作处理',
         ];