diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index fa419b6ac..b0d01a58f 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -214,10 +214,10 @@ class CompanyStatementPoolController extends ThinkController if($infolist[0]['company_type'] == 3){ //上游 - $this->viewCpPool($infolist,$is_export); + $this->viewCpPool($infolist,$is_export,$pool_info); }elseif($infolist[0]['company_type'] == 1){ //下游公司 - $this->viewPcPool($infolist,$is_export); + $this->viewPcPool($infolist,$is_export,$pool_info); }else{ //获取母单 if(!empty($pool_info['create_lack_ids'])){ diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index bf7da560a..a0f1818de 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -757,7 +757,7 @@ class CompanyStatementSetController extends Controller { $Spend = M("Spend","tab_"); $spenMap = [ "s.pay_status"=>1, - "s.pay_time"=>['between', [$begintime,$endtime]], + "s.payed_time"=>['between', [$begintime,$endtime]], ]; for ($i=0; $i