Merge branch 'fix/change_statement_time' of wmtx/platform into release

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -189,6 +189,9 @@ class CompanyStatementSetController extends Controller {
 			"_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();
+		if(empty($tmpp)){
+			return true;
+		}
 		$cp =[];
 		foreach ($tmpp as $v) {
 			$cp[$v['id']]=$v;
@@ -526,6 +529,9 @@ class CompanyStatementSetController extends Controller {
 		$tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,contact_phone link_phone,bank_name opening_bank,bank_address payee_name,bank_card bank_account,fax_ratio,taxation_rate,company_belong,company_type,ali_user,ali_account,has_server_fee,server_fee,has_ratio,turnover_ratio")
 				->where($pc_map)
 				->select();
+		if(empty($tmpp)){
+			return true;
+		}
         $pc =[];
         $Promote = M("Promote","tab_");
 		foreach ($tmpp as $v) {