|
@@ -181,7 +181,7 @@ class PLeaveOverService extends Service
|
|
|
$model->where('crt_time','<=',$return[1]);
|
|
$model->where('crt_time','<=',$return[1]);
|
|
|
}
|
|
}
|
|
|
if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
|
|
if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
|
|
|
- $return = $this->changeDateToTimeStampAboutRange($data['time'], true);
|
|
|
|
|
|
|
+ $return = $this->changeDateToTimeStampAboutRange($data['time']);
|
|
|
$model->where('order_time','>=',$return[0]);
|
|
$model->where('order_time','>=',$return[0]);
|
|
|
$model->where('order_time','<=',$return[1]);
|
|
$model->where('order_time','<=',$return[1]);
|
|
|
}
|
|
}
|