From a14f0abb88d375e61c6811e28cbeeb389ec4fa83 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 10:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E6=96=B0=E5=A2=9E=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index e96474a28..c24433cb4 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -181,14 +181,19 @@ class CompanyStatementSetController extends Controller { } if(count($js_id) ==0 || count($cpList) == 0){return ;} - $cp_id = implode(",",array_flip(array_flip(array_keys($cpList)))); + $cp_id = implode(",",array_flip(array_flip(array_keys($cpList))));//已绑定关系 $js_id = implode(",",array_unique($js_id)); //获取cp公司 - $tmpp = M("Partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,channel_rate,invoice_rate,taxation_rate,company_type,ali_user,ali_account,has_advance_charge,has_server_fee,server_fee")->where(["id"=>['in',$cp_id]])->select(); + $cpmap = [ + "id"=>['in',$cp_id], + "_string"=>"(validity_start_time > 0 AND validity_end_time = 0 ) OR validity_end_time >= {$endtime}" + ]; + $tmpp = M("Partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,channel_rate,invoice_rate,taxation_rate,company_type,ali_user,ali_account,has_advance_charge,has_server_fee,server_fee")->where($cpmap)->select(); $cp =[]; foreach ($tmpp as $v) { $cp[$v['id']]=$v; } + $cp_id = implode(",",array_column($tmpp,"id")); //结算的id unset($tmpp); //获取己方公司 $our = [];