From a825657516da1a53bed098a64f5807e37527e8ff Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 24 Jan 2022 00:10:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=97=B4=E6=97=B6=E6=9C=AA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E5=AD=90=E4=BB=BB=E5=8A=A1=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/ProjectTask.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 746a48e6..881f868f 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -686,11 +686,11 @@ class ProjectTask extends AbstractModel $start_at = Carbon::parse($subTask->start_at); $end_at = Carbon::parse($subTask->end_at); $isUp = false; - if ($start_at->eq($oldAt[0]) || $start_at->lt(Carbon::parse($this->start_at))) { + if (empty($subTask->start_at) || $start_at->eq($oldAt[0]) || $start_at->lt(Carbon::parse($this->start_at))) { $subTask->start_at = $this->start_at; $isUp = true; } - if ($end_at->eq($oldAt[1]) || $end_at->gt(Carbon::parse($this->end_at))) { + if (empty($subTask->end_at) || $end_at->eq($oldAt[1]) || $end_at->gt(Carbon::parse($this->end_at))) { $subTask->end_at = $this->end_at; $isUp = true; }