diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index c3df1b44a..b78cd052d 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -329,13 +329,7 @@ class ProjectTask extends AbstractModel $query->where(function ($q1) use ($start, $end, $type) { switch ($type) { case 'createdTime': - $q1->where(function ($q2) use ($start) { - $q2->where('project_tasks.created_at', '>=', $start); - })->orWhere(function ($q2) use ($end) { - $q2->where('project_tasks.created_at', '<=', $end); - })->orWhere(function ($q2) use ($start, $end) { - $q2->where('project_tasks.created_at', '>', $start)->where('project_tasks.created_at', '<', $end); - }); + $q1->where('project_tasks.created_at', '>=', $start)->where('project_tasks.created_at', '<=', $end); break; default: diff --git a/docker-compose.yml b/docker-compose.yml index 130363fa5..fa802728b 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -179,7 +179,7 @@ services: okr: container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.0.37" + image: "kuaifan/doookr:0.0.38" environment: TZ: "${TIMEZONE:-PRC}" DOO_TASK_URL: "http://${APP_IPPR}.3" diff --git a/public/site/en/download.html b/public/site/en/download.html index ea3446bd3..3dbabfb6f 100644 --- a/public/site/en/download.html +++ b/public/site/en/download.html @@ -342,8 +342,8 @@ - + diff --git a/public/site/en/log.html b/public/site/en/log.html index cdf1df3bd..4414fc17c 100644 --- a/public/site/en/log.html +++ b/public/site/en/log.html @@ -291,9 +291,9 @@ + - + diff --git a/public/site/zh/log.html b/public/site/zh/log.html index 31ec06d3b..2ac5da801 100644 --- a/public/site/zh/log.html +++ b/public/site/zh/log.html @@ -291,9 +291,9 @@ + -