From 7706cb2b19fbc49a51abae9bcbdcacc4a63548ec Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 9 Apr 2024 11:36:40 +0800 Subject: [PATCH] update --- app/adminapi/lists/cost_project/CostApprovedProjectLists.php | 2 +- app/adminapi/lists/marketing/MarketingHandoverContractLists.php | 2 +- app/adminapi/logic/cost_project/CostApprovedProjectLogic.php | 2 +- app/adminapi/logic/marketing/MarketingHandoverContractLogic.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php index 3e5f72d59..acdb677ec 100644 --- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php +++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php @@ -67,7 +67,7 @@ ->select()->each(function ($data) { $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); - $admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); + $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $data['part_a_name'] = $custom['name']; $data['signed_dept_name'] = $dept[$data['signed_dept']]; $data['supervise_dept_name'] = $dept[$data['supervise_dept']]; diff --git a/app/adminapi/lists/marketing/MarketingHandoverContractLists.php b/app/adminapi/lists/marketing/MarketingHandoverContractLists.php index ad9b52616..93ca3e10a 100644 --- a/app/adminapi/lists/marketing/MarketingHandoverContractLists.php +++ b/app/adminapi/lists/marketing/MarketingHandoverContractLists.php @@ -65,7 +65,7 @@ $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); - $admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); + $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']]; diff --git a/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php b/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php index fcf6eae41..a9f54ff20 100644 --- a/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php +++ b/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php @@ -29,7 +29,7 @@ $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); - $admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); + $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']]; diff --git a/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php b/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php index 7bd351764..82e18d224 100644 --- a/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php +++ b/app/adminapi/logic/marketing/MarketingHandoverContractLogic.php @@ -214,7 +214,7 @@ $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); - $admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); + $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']];