Merge branch 'feature/add_item' of wmtx/platform into release

汇总导出bug修正

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;