diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index a6a473368..e83c28bcb 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -155,8 +155,11 @@ class PartnerController extends ThinkController $value['settlement_type'] = '月结'; } $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司'; - $value['contract_time'] = time_format($value['contract_start_time'], 'Y/m/d') . '-' . - time_format($value['contract_end_time'], 'Y/m/d'); + $contract_start_time = $value['contract_start_time'] ? + time_format($value['contract_start_time'], 'Y/m/d') : '-'; + $contract_end_time = $value['contract_end_time'] ? + time_format($value['contract_end_time'], 'Y/m/d') : '-'; + $value['contract_time'] = $contract_start_time . '-' . $contract_end_time; $row2 = array_sum(array_column($value['game'], 'row')) ; $value['row'] = empty($row2) ? 1: $row2; $parseData[$value['partner_id']][] = $value; diff --git a/Application/Admin/View/Tool/company_info.html b/Application/Admin/View/Tool/company_info.html index 2344597a5..d8a5f39d0 100644 --- a/Application/Admin/View/Tool/company_info.html +++ b/Application/Admin/View/Tool/company_info.html @@ -157,7 +157,7 @@