From 93c75dca1478937e45d629f4fda3656edbd2b595 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 9 Apr 2024 16:32:17 +0800 Subject: [PATCH] update --- .../marketing/MarketingSupplementaryAgreementLists.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/adminapi/lists/marketing/MarketingSupplementaryAgreementLists.php b/app/adminapi/lists/marketing/MarketingSupplementaryAgreementLists.php index 573711fd6..0761b023a 100644 --- a/app/adminapi/lists/marketing/MarketingSupplementaryAgreementLists.php +++ b/app/adminapi/lists/marketing/MarketingSupplementaryAgreementLists.php @@ -58,7 +58,7 @@ */ public function lists(): array { - return MarketingContract::withoutField('update_time,delete_time')->where($this->searchWhere)->where('contract_type', 1) + return MarketingContract::withoutField('update_time,delete_time')->where($this->searchWhere)->where('contract_type', 2) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { @@ -68,10 +68,10 @@ $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $data['supplementary_agreement_name'] = $contract['contract_name']; $data['part_a_name'] = $custom['name']; - $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; + $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? ''; $data['signed_dept_name'] = $dept['name']; - $data['signed_head_name'] = $admin[$data['signed_head']]; - $data['seal_user_name'] = $admin[$data['seal_user']]; + $data['signed_head_name'] = $admin[$data['signed_head']] ?? ''; + $data['seal_user_name'] = $admin[$data['seal_user']] ?? ''; $data['business_nature_text'] = $data->business_nature_text; $data['agreement_nature_text'] = $data->agreement_nature_text; $data['seal_name_text'] = $data->seal_name_text; @@ -106,7 +106,7 @@ */ public function count(): int { - return MarketingContract::where($this->searchWhere)->where('contract_type', 1)->count(); + return MarketingContract::where($this->searchWhere)->where('contract_type', 2)->count(); } } \ No newline at end of file