From e0faf898b1acaf77df786fec767825a01e3148e9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 22 Jul 2023 17:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/contract/ContractLogic.php | 2 +-
 app/common/model/contract/Contract.php        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php
index 292cce18f..171577343 100644
--- a/app/adminapi/logic/contract/ContractLogic.php
+++ b/app/adminapi/logic/contract/ContractLogic.php
@@ -115,6 +115,6 @@ class ContractLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return Contract::findOrEmpty($params['id'])->toArray();
+        return Contract::with(['companyName','partyA','partyB','contractType'])->findOrEmpty($params['id'])->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/common/model/contract/Contract.php b/app/common/model/contract/Contract.php
index ae86d6c78..ecb3771a1 100644
--- a/app/common/model/contract/Contract.php
+++ b/app/common/model/contract/Contract.php
@@ -46,7 +46,11 @@ class Contract extends BaseModel
     }
     public function partyA()
     {
-        return $this->hasOne(Company::class, 'id', 'company_id')->bind(['party_a_name'=>'company_name']);;
+        return $this->hasOne(Company::class, 'id', 'party_a')->bind(['party_a_name'=>'company_name']);
+    }
+    public function partyB()
+    {
+        return $this->hasOne(Company::class, 'id', 'party_b')->bind(['party_b_name'=>'company_name']);
     }
     public function contractType()
     {