From 757689573b046a13a2b372294493da99ded91423 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 5 Feb 2026 11:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/InvRequisitionController.php | 4 +++-
 app/common/service/InvRequisitionService.php      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/InvRequisitionController.php b/app/admin/controller/InvRequisitionController.php
index aabea33..3afdaa3 100644
--- a/app/admin/controller/InvRequisitionController.php
+++ b/app/admin/controller/InvRequisitionController.php
@@ -86,7 +86,9 @@ class InvRequisitionController extends BaseController
      protected function showFormat($data)
      {
          if (isset($data['id'])){
-             $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get();
+             $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get()->toArray();
+             $approve_id = !empty($data['approve'])?array_pop($data['approve'])['id']:null;
+             $data['approve_id'] = $approve_id;
          }
          if (isset($data['created_at']))
              $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
diff --git a/app/common/service/InvRequisitionService.php b/app/common/service/InvRequisitionService.php
index 3e55cad..fe25db4 100644
--- a/app/common/service/InvRequisitionService.php
+++ b/app/common/service/InvRequisitionService.php
@@ -147,7 +147,7 @@ class InvRequisitionService
                 return $res;
             });
         } catch (\Throwable $e) {
-            throw new BusinessException("创建物品申请失败：");
+            throw new BusinessException("创建物品申请失败：".$e->getMessage());
         }
     }