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