From a86ec2e105caaeaba3386b6abbee4dba094a6f21 Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Tue, 29 Jul 2025 12:35:19 +0800
Subject: [PATCH] Merge branch 'develop'

# Conflicts:
#	app/common/utils/FeishuMessage.php
#	app/inquiry/controller/InquiryLogController.php
#	app/queue/redis/FeishuMessage.php
---
 app/inquiry/controller/InquiryLogController.php |  5 -----
 app/ticket/controller/TicketController.php      |  1 +
 app/ticket/service/TicketService.php            | 13 +++++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/inquiry/controller/InquiryLogController.php b/app/inquiry/controller/InquiryLogController.php
index dec1ca4..89af6b0 100644
--- a/app/inquiry/controller/InquiryLogController.php
+++ b/app/inquiry/controller/InquiryLogController.php
@@ -46,11 +46,6 @@ class InquiryLogController extends BaseController
         if (isset($data['t_time'])) {
             $data['t_time'] = $data['t_time'] > 0 ? date('Y-m-d H:i:s', $data['t_time']) : 0;
         }
-            
-        if (isset($data['quality'])) {
-                $inquiryLogService = new InquiryLogService();
-            $data['quality'] = $inquiryLogService->qualityName($data['quality']);
-        }
         // var_dump($data);
         return $data;
     }
diff --git a/app/ticket/controller/TicketController.php b/app/ticket/controller/TicketController.php
index 3eb3222..cb2290e 100644
--- a/app/ticket/controller/TicketController.php
+++ b/app/ticket/controller/TicketController.php
@@ -75,6 +75,7 @@ class TicketController extends BaseController
     public function getStatus(Request $request)
     {
         try {
+            $request->setGet('user_id', $request->user->uid);
             $result = (new TicketService())->getStatus($request->all());
             return $result
                 ? $this->success($result)
diff --git a/app/ticket/service/TicketService.php b/app/ticket/service/TicketService.php
index 6250b5f..cdacddf 100644
--- a/app/ticket/service/TicketService.php
+++ b/app/ticket/service/TicketService.php
@@ -129,6 +129,19 @@ class TicketService
         foreach ($ticket_status as $key => $value) {
             $status[] = ['value' => $key, 'text' => $value];
         }
+
+        if (empty($data['id'])) {
+            return $status;
+        }
+
+        $res = (new TicketLogic())->find($data['id']);
+        if(!empty($res) && $res->user_id == $data['user_id']){
+            $status = [
+                ['value' => Constants::TICKET_STATUS['PENDING'], 'text' => $ticket_status[Constants::TICKET_STATUS['PENDING']]],
+                ['value' => Constants::TICKET_STATUS['REJECTED'], 'text' => $ticket_status[Constants::TICKET_STATUS['REJECTED']]],
+            ];
+        }
+
         return $status;
     }
 }