wip

app/admin/controller/Ticket.php

@@ -8,6 +8,8 @@ use app\common\model\Tickets;
 use app\common\service\TicketNotifier;
 use app\common\service\TicketService;
 use think\facade\Session;
+use app\common\service\TicketScope;
+
 
 class Ticket extends BaseController
 {
@@ -15,7 +17,7 @@ class Ticket extends BaseController
     /**
      * 查询工单
      */
-    public function ticketsFind(TicketService $ticketService)
+    public function fetchTickets(TicketService $ticketService)
     {
         // 在控制器明确接收参数
         $params = [
@@ -32,7 +34,11 @@ class Ticket extends BaseController
         $limit = min(max(($params['limit'] ?? 20), 1), 100);
         $order = strtolower($params['sortOrder'] ?? 'desc') === 'asc' ? 'asc' : 'desc';
 
-        $result = $ticketService->queryTickets($params, $page, $limit, $order);
+        try {
+            $result = $ticketService->queryTickets($params, $page, $limit, $order, TicketScope::admin());
+        } catch (\Exception $e) {
+            return $this->error($e->getMessage());
+        }
 
         return $this->success('查询成功', $result);
     }
@@ -47,13 +53,13 @@ class Ticket extends BaseController
 
         try {
             $result = $ticketService->createTicket($data);
-            return $this->success('创建成功', $result);
         } catch (\Exception $e) {
             if ($e->getCode() === 409) {
                 return $this->error($e->getMessage(), ['confirm' => true], 409);
             }
             return $this->error($e->getMessage());
         }
+        return $this->success('创建成功', $result);
     }
 
 
@@ -70,10 +76,11 @@ class Ticket extends BaseController
 
         try {
             $result = $ticketService->updateTicket($id, $data, $allowFields, $adminId, true);
-            return $this->success('更新成功', $result);
         } catch (\Exception $e) {
             return $this->error($e->getMessage());
         }
+
+        return $this->success('更新成功', $result);
     }