Merge branch 'develop'

# Conflicts: # app/common/utils/FeishuMessage.php # app/inquiry/controller/InquiryLogController.php # app/queue/redis/FeishuMessage.php
2025-07-29 12:35:19 +08:00
parent 7eeb1b6e1f
commit a86ec2e105
3 changed files with 14 additions and 5 deletions
@@ -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;
    }
 }