diff --git a/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php b/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php index 2dac161c3..ed7a0523c 100644 --- a/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php +++ b/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php @@ -129,6 +129,8 @@ class AdministrativePaymentsLogic extends BaseLogic { $administrativePayments = AdministrativePayments::findOrEmpty($params['id']); $administrativePayments->contract; + $administrativePayments->org; + $administrativePayments->dept; return $administrativePayments->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php b/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php index 2d8a32302..6b20f5a48 100644 --- a/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php +++ b/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php @@ -129,6 +129,8 @@ class AdministrativeTicketCollectionLogic extends BaseLogic { $administrativeTicketCollection = AdministrativeTicketCollection::findOrEmpty($params['id']); $administrativeTicketCollection->contract; + $administrativeTicketCollection->org; + $administrativeTicketCollection->dept; return $administrativeTicketCollection->toArray(); } } \ No newline at end of file diff --git a/app/common/model/administrative/AdministrativePayments.php b/app/common/model/administrative/AdministrativePayments.php index ef4554323..9d50e773d 100644 --- a/app/common/model/administrative/AdministrativePayments.php +++ b/app/common/model/administrative/AdministrativePayments.php @@ -42,4 +42,14 @@ class AdministrativePayments extends BaseModel return $this->hasOne(\app\common\model\contract\AdministrativeContract::class, 'id', 'administrative_contract_id'); } + public function org() + { + return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id'); + } + + public function dept() + { + return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id'); + } + } \ No newline at end of file diff --git a/app/common/model/administrative/AdministrativeTicketCollection.php b/app/common/model/administrative/AdministrativeTicketCollection.php index 3f47ec125..cd2fc80ee 100644 --- a/app/common/model/administrative/AdministrativeTicketCollection.php +++ b/app/common/model/administrative/AdministrativeTicketCollection.php @@ -42,4 +42,14 @@ class AdministrativeTicketCollection extends BaseModel return $this->hasOne(\app\common\model\contract\AdministrativeContract::class, 'id', 'administrative_contract_id'); } + public function org() + { + return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id'); + } + + public function dept() + { + return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id'); + } + } \ No newline at end of file