From b7c91c1847a52c46646ce327200b6628384dcc60 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 28 Nov 2024 14:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugs/think-plugs-ticket/src/controller/Ticket.php  | 6 +++---
 plugs/think-plugs-ticket/src/model/TicketTicket.php | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugs/think-plugs-ticket/src/controller/Ticket.php b/plugs/think-plugs-ticket/src/controller/Ticket.php
index cc95daf..dde91ec 100644
--- a/plugs/think-plugs-ticket/src/controller/Ticket.php
+++ b/plugs/think-plugs-ticket/src/controller/Ticket.php
@@ -31,9 +31,9 @@ class Ticket extends Controller
 
         }, function (QueryHelper $query) {
             $query->like(['title|content|contact_name|ticket_address|contact_phone#keyword'])
-                ->dateBetween(['create_at', 'last_activity_at'])
+                ->dateBetween(['create_at'])
                 ->equal(['status', 'type_id']);
-            $query->with(['user'])->append(['imgs_arr', 'status_text', 'type_name', 'last_reply']);
+            $query->append(['imgs_arr', 'status_text', 'type_name', 'last_reply']);
         });
     }
 
@@ -56,7 +56,7 @@ class Ticket extends Controller
     public function _form_filter(&$data)
     {
         if ($this->request->isPost()) {
-            $data['uid'] = 0;
+            $data['user_id'] = 0;
         }
         $data['status'] = 0;
     }
diff --git a/plugs/think-plugs-ticket/src/model/TicketTicket.php b/plugs/think-plugs-ticket/src/model/TicketTicket.php
index 98e7eb9..78c0edd 100644
--- a/plugs/think-plugs-ticket/src/model/TicketTicket.php
+++ b/plugs/think-plugs-ticket/src/model/TicketTicket.php
@@ -2,7 +2,6 @@
 
 namespace plugin\ticket\model;
 
-use plugin\account\model\PluginAccountBind;
 use think\admin\Model;
 
 class TicketTicket extends Model
@@ -15,7 +14,7 @@ class TicketTicket extends Model
 
     public function user()
     {
-        return $this->belongsTo(PluginAccountBind::class, 'uid');
+        return $this->morphTo('user');
     }
 
     public function reply()
@@ -23,6 +22,11 @@ class TicketTicket extends Model
         return $this->hasMany(TicketReply::class, 'ticket_id')->order("create_at", 'asc');
     }
 
+    public function source()
+    {
+        return $this->morphTo();
+    }
+
     public function getImgsArrAttr($value, $data)
     {
         return str2arr($data['imgs'] ?: '', '|');