diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 87ceb03f8..5f6b39ac7 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -1965,8 +1965,10 @@ class CompanyStatementController extends ThinkController if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $map['payed_time'] = ['between', [$start_time, $end_time]]; - $radioMap['_string'] = "(begin_time>{$start_time} and begin_time<{$end_time}) - or (end_time>{$start_time} and (end_time<{$end_time} and end_time!=0)) or (begin_time<{$start_time} and end_time>{$end_time}) or (begin_time<{$start_time} and end_time = 0)"; + $radioMap['_string'] = "(begin_time >= {$start_time} and begin_time <= {$end_time}) + or (begin_time <= {$start_time} and end_time = 0) + or (end_time >= {$start_time} and (end_time <= {$end_time} and end_time != 0)) + or (begin_time <= {$start_time} and end_time >= {$end_time}) "; } elseif (isset($_REQUEST['time_start'])) { $map['payed_time'] = ['GT', $start_time];