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() {