From 8476ed2e51fa4160a1d409e8e1e4564432a8e8a6 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Mon, 17 Jul 2023 11:28:18 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=AE=80=E5=8D=95=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=20-=20=E8=BF=87=E6=BB=A4=E6=8E=89?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 339878c15..d98d61752 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1070,7 +1070,7 @@ class ProjectController extends AbstractController
             ->leftJoin('project_task_users', function ($query) {
                 $query->on('project_tasks.id', '=', 'project_task_users.task_id');
             })
-            ->whereIn("project_task_users.userid", explode(',', $userid) )
+            ->whereIn('project_task_users.userid', explode(',', $userid) )
             ->when(!empty($timerange),function ($query) use($timerange) {
                 if (!is_array($timerange)) {
                     $timerange =  explode(',', $timerange);
@@ -1079,6 +1079,7 @@ class ProjectController extends AbstractController
                     $query->whereBetween('project_tasks.created_at',[Carbon::parse($timerange[0])->startOfDay(),Carbon::parse($timerange[1])->endOfDay()] );
                 }
             })
+            ->whereNull('complete_at')
             ->orderByDesc('project_tasks.id')
             ->paginate(Base::getPaginate(200, 100));
         //