diff --git a/app/adminapi/lists/financial/FinancialBudgetDocLists.php b/app/adminapi/lists/financial/FinancialBudgetDocLists.php index 604fb35a6..d7abae25f 100644 --- a/app/adminapi/lists/financial/FinancialBudgetDocLists.php +++ b/app/adminapi/lists/financial/FinancialBudgetDocLists.php @@ -65,7 +65,7 @@ ->order(['id' => 'desc']) ->select()->each(function ($data) { $contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); - $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; $data['part_a'] = $custom['name']; $data['create_date'] = $contract['create_time']; diff --git a/app/adminapi/logic/financial/FinancialBudgetDocLogic.php b/app/adminapi/logic/financial/FinancialBudgetDocLogic.php index fe2cf9d80..5fad1c2fb 100644 --- a/app/adminapi/logic/financial/FinancialBudgetDocLogic.php +++ b/app/adminapi/logic/financial/FinancialBudgetDocLogic.php @@ -156,7 +156,7 @@ { $data = FinancialBudgetDoc::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); - $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; $data['part_a'] = $custom['name']; $data['create_date'] = $contract['create_time']; diff --git a/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php b/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php index 2e2a7832f..902647de2 100644 --- a/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php +++ b/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php @@ -157,7 +157,7 @@ $data = FinancialDepartmentIncomeSettlement::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $budget_doc = FinancialBudgetDoc::field('contract_id,code,name,issue_date')->where('id', $data['budget_doc_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,contract_type')->where('id', $budget_doc['contract_id'])->findOrEmpty(); - $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); $data['code'] = $budget_doc['code']; $data['name'] = $budget_doc['name']; $data['issue_date'] = $budget_doc['issue_date'];