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());