From 7539719d15fb4f76daff694dd9fc6d00a5c19969 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 26 Aug 2023 17:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/TaskController.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 418eb5c24..0b136cb36 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -34,11 +34,14 @@ class TaskController extends BaseApiController $param['end_time']=date('Y-m-d H:i:s',$end); $where[] = ['start_time', 'between', [$time, $end]]; } else { - $time = strtotime(date('Y-m-d')); - $param['start_time']=date('Y-m-d H:i:s',$time); - $end = $time + 86399; - $param['end_time']=date('Y-m-d H:i:s',$end); - $where[] = ['start_time', 'between', [$time, $end]]; + if(!isset($param['status'])){ + $time = strtotime(date('Y-m-d')); + $param['start_time']=date('Y-m-d H:i:s',$time); + $end = $time + 86399; + $param['end_time']=date('Y-m-d H:i:s',$end); + $where[] = ['start_time', 'between', [$time, $end]]; + } + } if (isset($param['status']) && $param['status'] > 0) { $where[] = ['status', '=', $param['status']];