From aaceb659875837d2347b737dde73a968888c9619 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 25 Jan 2024 15:00:49 +0800 Subject: [PATCH] update --- app/adminapi/lists/contract/ProcurementContractDetailLists.php | 2 +- .../lists/material/MaterialPurchaseRequestDetailLists.php | 2 +- app/adminapi/lists/project/ProjectMaterialBudgetDetailLists.php | 2 +- app/adminapi/logic/contract/ProcurementContractDetailLogic.php | 2 +- .../logic/material/MaterialPurchaseRequestDetailLogic.php | 2 +- app/adminapi/logic/project/ProjectMaterialBudgetDetailLogic.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/adminapi/lists/contract/ProcurementContractDetailLists.php b/app/adminapi/lists/contract/ProcurementContractDetailLists.php index a53434de7..32b604f74 100644 --- a/app/adminapi/lists/contract/ProcurementContractDetailLists.php +++ b/app/adminapi/lists/contract/ProcurementContractDetailLists.php @@ -82,7 +82,7 @@ class ProcurementContractDetailLists extends BaseAdminDataLists implements Lists $data['contract_no'] = $contract['contract_no']; $data['contract_type'] = $contract->contract_type_text; $data['material_purchase_request_code'] = $material_purchase_request['material_purchase_request_code']; - $data['material_first_level'] = $material_classify[$material['first_level']]; + $data['material_first_level'] = !empty($material_classify[$material['first_level']]) ? $material_classify[$material['first_level']] : ''; $data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : ''; $data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : ''; $data['material_name'] = $material['name']; diff --git a/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php b/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php index 3255609c2..5ea4ac199 100644 --- a/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php +++ b/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php @@ -81,7 +81,7 @@ class MaterialPurchaseRequestDetailLists extends BaseAdminDataLists implements L $data['project_code'] = $project['project_code']; $data['apply_date'] = $material_purchase_request['apply_date']; $data['arrival_date'] = $material_purchase_request['arrival_date']; - $data['material_first_level'] = $material_classify[$material['first_level']]; + $data['material_first_level'] = !empty($material_classify[$material['first_level']]) ? $material_classify[$material['first_level']] : ''; $data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : ''; $data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : ''; $data['material_name'] = $material['name']; diff --git a/app/adminapi/lists/project/ProjectMaterialBudgetDetailLists.php b/app/adminapi/lists/project/ProjectMaterialBudgetDetailLists.php index 005730b9a..c5272581e 100644 --- a/app/adminapi/lists/project/ProjectMaterialBudgetDetailLists.php +++ b/app/adminapi/lists/project/ProjectMaterialBudgetDetailLists.php @@ -72,7 +72,7 @@ class ProjectMaterialBudgetDetailLists extends BaseAdminDataLists implements Lis $data['material_budget_code'] = $material_budget['material_budget_code']; $data['project_name'] = $project['name']; $data['project_code'] = $project['project_code']; - $data['material_first_level'] = $material_classify[$material['first_level']]; + $data['material_first_level'] = !empty($material_classify[$material['first_level']]) ? $material_classify[$material['first_level']] : ''; $data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : ''; $data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : ''; $data['material_name'] = $material['name']; diff --git a/app/adminapi/logic/contract/ProcurementContractDetailLogic.php b/app/adminapi/logic/contract/ProcurementContractDetailLogic.php index 335682fb6..3677c654d 100644 --- a/app/adminapi/logic/contract/ProcurementContractDetailLogic.php +++ b/app/adminapi/logic/contract/ProcurementContractDetailLogic.php @@ -138,7 +138,7 @@ class ProcurementContractDetailLogic extends BaseLogic $data['contract_name'] = $contract['contract_name']; $data['contract_type'] = $contract->contract_type_text; $data['material_purchase_request_code'] = $material_purchase_request['material_purchase_request_code']; - $data['material_first_level'] = $material_classify[$material['first_level']]; + $data['material_first_level'] = !empty($material_classify[$material['first_level']]) ? $material_classify[$material['first_level']] : ''; $data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : ''; $data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : ''; $data['material_name'] = $material['name']; diff --git a/app/adminapi/logic/material/MaterialPurchaseRequestDetailLogic.php b/app/adminapi/logic/material/MaterialPurchaseRequestDetailLogic.php index 88d8e3230..0e7d395e0 100644 --- a/app/adminapi/logic/material/MaterialPurchaseRequestDetailLogic.php +++ b/app/adminapi/logic/material/MaterialPurchaseRequestDetailLogic.php @@ -128,7 +128,7 @@ class MaterialPurchaseRequestDetailLogic extends BaseLogic $data['project_code'] = $project['project_code']; $data['apply_date'] = $material_purchase_request['apply_date']; $data['arrival_date'] = $material_purchase_request['arrival_date']; - $data['material_first_level'] = $material_classify[$material['first_level']]; + $data['material_first_level'] = !empty($material_classify[$material['first_level']]) ? $material_classify[$material['first_level']] : ''; $data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : ''; $data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : ''; $data['material_name'] = $material['name']; diff --git a/app/adminapi/logic/project/ProjectMaterialBudgetDetailLogic.php b/app/adminapi/logic/project/ProjectMaterialBudgetDetailLogic.php index 6c3c07323..d5be31185 100644 --- a/app/adminapi/logic/project/ProjectMaterialBudgetDetailLogic.php +++ b/app/adminapi/logic/project/ProjectMaterialBudgetDetailLogic.php @@ -128,7 +128,7 @@ class ProjectMaterialBudgetDetailLogic extends BaseLogic $data['material_budget_code'] = $material_budget['material_budget_code']; $data['project_name'] = $project['name']; $data['project_code'] = $project['project_code']; - $data['material_first_level'] = $material_classify[$material['first_level']]; + $data['material_first_level'] = !empty($material_classify[$material['first_level']]) ? $material_classify[$material['first_level']] : ''; $data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : ''; $data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : ''; $data['material_name'] = $material['name'];