From 28b3bd7d999b10ec3facc5768b01b5818e2ef501 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 9 Apr 2024 14:15:29 +0800 Subject: [PATCH] update --- .../lists/marketing/MarketingContractLists.php | 12 ++++++------ .../marketing/MarketingFrameworkAgreementLists.php | 6 +++--- .../marketing/MarketingHandoverContractLists.php | 12 ++++++------ .../logic/cost_project/CostApprovedProjectLogic.php | 12 ++++++------ .../logic/marketing/MarketingContractLogic.php | 12 ++++++------ .../marketing/MarketingFrameworkAgreementLogic.php | 6 +++--- .../marketing/MarketingHandoverContractLogic.php | 12 ++++++------ .../MarketingSupplementaryAgreementLogic.php | 6 +++--- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/adminapi/lists/marketing/MarketingContractLists.php b/app/adminapi/lists/marketing/MarketingContractLists.php index 813a594bd..242659e49 100644 --- a/app/adminapi/lists/marketing/MarketingContractLists.php +++ b/app/adminapi/lists/marketing/MarketingContractLists.php @@ -69,12 +69,12 @@ $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $data['framework_agreement_name'] = $contract['contract_name']; $data['part_a_name'] = $custom['name']; - $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; - $data['signed_dept_name'] = $dept[$data['signed_dept']]; - $data['supervise_dept_name'] = $dept[$data['supervise_dept']]; - $data['signed_head_name'] = $admin[$data['signed_head']]; - $data['project_manager_name'] = $admin[$data['project_manager']]; - $data['seal_user_name'] = $admin[$data['seal_user']]; + $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? ''; + $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; + $data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? ''; + $data['signed_head_name'] = $admin[$data['signed_head']] ?? ''; + $data['project_manager_name'] = $admin[$data['project_manager']] ?? ''; + $data['seal_user_name'] = $admin[$data['seal_user']] ?? ''; $data['business_nature_text'] = $data->business_nature_text; $data['industry_nature_text'] = $data->industry_nature_text; $data['fund_sources_text'] = $data->fund_sources_text; diff --git a/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php b/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php index d5812d7fe..0630012a0 100644 --- a/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php +++ b/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php @@ -66,10 +66,10 @@ $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $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; diff --git a/app/adminapi/lists/marketing/MarketingHandoverContractLists.php b/app/adminapi/lists/marketing/MarketingHandoverContractLists.php index 93ca3e10a..fd0388d51 100644 --- a/app/adminapi/lists/marketing/MarketingHandoverContractLists.php +++ b/app/adminapi/lists/marketing/MarketingHandoverContractLists.php @@ -68,12 +68,12 @@ $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $data['framework_agreement_name'] = $contract['contract_name']; $data['part_a_name'] = $custom['name']; - $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; - $data['signed_dept_name'] = $dept[$data['signed_dept']]; - $data['supervise_dept_name'] = $dept[$data['supervise_dept']]; - $data['signed_head_name'] = $admin[$data['signed_head']]; - $data['project_manager_name'] = $admin[$data['project_manager']]; - $data['seal_user_name'] = $admin[$data['seal_user']]; + $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? ''; + $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; + $data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? ''; + $data['signed_head_name'] = $admin[$data['signed_head']] ?? ''; + $data['project_manager_name'] = $admin[$data['project_manager']] ?? ''; + $data['seal_user_name'] = $admin[$data['seal_user']] ?? ''; $data['business_nature_text'] = $data->business_nature_text; $data['industry_nature_text'] = $data->industry_nature_text; $data['fund_sources_text'] = $data->fund_sources_text; diff --git a/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php b/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php index a9f54ff20..47d73b187 100644 --- a/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php +++ b/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php @@ -32,12 +32,12 @@ $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $data['framework_agreement_name'] = $contract['contract_name']; $data['part_a_name'] = $custom['name']; - $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; - $data['signed_dept_name'] = $dept[$data['signed_dept']]; - $data['supervise_dept_name'] = $dept[$data['supervise_dept']]; - $data['signed_head_name'] = $admin[$data['signed_head']]; - $data['project_manager_name'] = $admin[$data['project_manager']]; - $data['seal_user_name'] = $admin[$data['seal_user']]; + $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? ''; + $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; + $data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? ''; + $data['signed_head_name'] = $admin[$data['signed_head']] ?? ''; + $data['project_manager_name'] = $admin[$data['project_manager']] ?? ''; + $data['seal_user_name'] = $admin[$data['seal_user']] ?? ''; $data['business_nature_text'] = $data->business_nature_text; $data['industry_nature_text'] = $data->industry_nature_text; $data['fund_sources_text'] = $data->fund_sources_text; diff --git a/app/adminapi/logic/marketing/MarketingContractLogic.php b/app/adminapi/logic/marketing/MarketingContractLogic.php index 357a4d58f..453d38672 100644 --- a/app/adminapi/logic/marketing/MarketingContractLogic.php +++ b/app/adminapi/logic/marketing/MarketingContractLogic.php @@ -194,12 +194,12 @@ $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $data['framework_agreement_name'] = $contract['contract_name']; $data['part_a_name'] = $custom['name']; - $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; - $data['signed_dept_name'] = $dept[$data['signed_dept']]; - $data['supervise_dept_name'] = $dept[$data['supervise_dept']]; - $data['signed_head_name'] = $admin[$data['signed_head']]; - $data['project_manager_name'] = $admin[$data['project_manager']]; - $data['seal_user_name'] = $admin[$data['seal_user']]; + $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? ''; + $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; + $data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? ''; + $data['signed_head_name'] = $admin[$data['signed_head']] ?? ''; + $data['project_manager_name'] = $admin[$data['project_manager']] ?? ''; + $data['seal_user_name'] = $admin[$data['seal_user']] ?? ''; $data['business_nature_text'] = $data->business_nature_text; $data['industry_nature_text'] = $data->industry_nature_text; $data['fund_sources_text'] = $data->fund_sources_text; diff --git a/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php b/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php index 1ac53dcc2..1f35e72d1 100644 --- a/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php +++ b/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php @@ -168,10 +168,10 @@ $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $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; diff --git a/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php b/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php index 82e18d224..8f25b9ac4 100644 --- a/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php +++ b/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php @@ -217,12 +217,12 @@ $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $data['framework_agreement_name'] = $contract['contract_name']; $data['part_a_name'] = $custom['name']; - $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; - $data['signed_dept_name'] = $dept[$data['signed_dept']]; - $data['supervise_dept_name'] = $dept[$data['supervise_dept']]; - $data['signed_head_name'] = $admin[$data['signed_head']]; - $data['project_manager_name'] = $admin[$data['project_manager']]; - $data['seal_user_name'] = $admin[$data['seal_user']]; + $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? ''; + $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; + $data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? ''; + $data['signed_head_name'] = $admin[$data['signed_head']] ?? ''; + $data['project_manager_name'] = $admin[$data['project_manager']] ?? ''; + $data['seal_user_name'] = $admin[$data['seal_user']] ?? ''; $data['business_nature_text'] = $data->business_nature_text; $data['industry_nature_text'] = $data->industry_nature_text; $data['fund_sources_text'] = $data->fund_sources_text; diff --git a/app/adminapi/logic/marketing/MarketingSupplementaryAgreementLogic.php b/app/adminapi/logic/marketing/MarketingSupplementaryAgreementLogic.php index a790ec814..82f102c49 100644 --- a/app/adminapi/logic/marketing/MarketingSupplementaryAgreementLogic.php +++ b/app/adminapi/logic/marketing/MarketingSupplementaryAgreementLogic.php @@ -166,10 +166,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['seal_name_text'] = $data->seal_name_text; $data['is_limit_text'] = $data->is_limit_text;