From 053e8acb8f3bc3fa5d8e5532d08bdc217c8d63f8 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 12 Oct 2020 18:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=AF=BC=E5=87=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AggregateFinanceStatementController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 287c971f2..46acbb86a 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -649,13 +649,13 @@ class AggregateFinanceStatementController extends ThinkController $company_type = 0; $company_info = []; - if ($relation['first_company_type'] == 3) { + if ($relation['collection'] == 1) { $company_info = json_decode($relation['first_company_info'],true); - } elseif($relation['second_company_type'] == 3) { + } elseif($relation['collection'] == 2) { $company_info = json_decode($relation['second_company_info'],true); } - if ($company_info['invoice_type']&&$company_info['invoice_type']!='0') { + if ($company_info['invoice_type']) { $company_type = 1; } else { $company_type = 2;