Merge branch 'develop'

# Conflicts:
#	app/common/utils/FeishuMessage.php
#	app/inquiry/controller/InquiryLogController.php
#	app/queue/redis/FeishuMessage.php

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;
     }

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)

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;
     }
 }