From f7cd4f34d3d1d5ced91feff69f0ef377b337a875 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 10 Feb 2022 17:09:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B0=E6=B7=BB=E5=8A=A0=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8D=E5=87=BA=E7=8E=B0=E5=9C=A8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BE=A4=E8=81=8A=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Project.php     | 2 +-
 app/Models/ProjectTask.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Project.php b/app/Models/Project.php
index a327595a..37d0a532 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -212,7 +212,7 @@ class Project extends AbstractModel
      */
     public function relationUserids()
     {
-        return $this->projectUser->pluck('userid')->toArray();
+        return ProjectUser::whereProjectId($this->id)->orderBy('id')->pluck('userid')->toArray();
     }
 
     /**
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index abc3ef76..f8fa7d84 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -851,7 +851,7 @@ class ProjectTask extends AbstractModel
      */
     public function relationUserids()
     {
-        $userids = $this->taskUser->pluck('userid')->toArray();
+        $userids = ProjectTaskUser::whereTaskId($this->id)->orderByDesc('owner')->orderByDesc('id')->pluck('userid')->toArray();
         $items = ProjectTask::with(['taskUser'])->where('parent_id', $this->id)->whereNull('archived_at')->get();
         foreach ($items as $item) {
             $userids = array_merge($userids, $item->taskUser->pluck('userid')->toArray());