From 3da11b4b371fbd1c16cabb6251d3eda7c45da75f Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 10 Feb 2026 10:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InvRequisitionController.php   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/InvRequisitionController.php b/app/admin/controller/InvRequisitionController.php
index c54f81a..70c5096 100644
--- a/app/admin/controller/InvRequisitionController.php
+++ b/app/admin/controller/InvRequisitionController.php
@@ -79,17 +79,18 @@ class InvRequisitionController extends BaseController
      */
      protected function indexFormat($data, $applicant_id)
      {
-//         if (isset($data['id'])){
-//             $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get();
-//         }
-         if (isset($data['created_at'])){
-             $data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($data['created_at']);{
-                 $data['updated_at'] = is_int($data['updated_at'])?$data['updated_at']:strtotime($data['updated_at']);
-                 $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
-             }
+         if (isset($data['id'])){
+             //$data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get();
+             $data = $data->toArray();
          }
-         if (isset($data['updated_at']))
+         if (isset($data['created_at'])){
+             $data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($data['created_at']);
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+         }
+         if (isset($data['updated_at'])){
+             $data['updated_at'] = is_int($data['updated_at'])?$data['updated_at']:strtotime($data['updated_at']);
              $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         }
          if (isset($data['id'])){
              $data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get();
          }