From 0737a9fae74374c886ddc25f37b3ad4c0c637b38 Mon Sep 17 00:00:00 2001
From: weifs <605403358@qq.com>
Date: Mon, 23 Dec 2024 23:19:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7=20-=20=E4=BB=BB=E5=8A=A1=E9=87=8D?=
 =?UTF-8?q?=E8=A6=86=E8=8E=B7=E5=8F=96,=20=E5=AD=90=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E7=9C=8B=E4=B8=8D=E5=88=B0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 5 -----
 app/Observers/ProjectTaskObserver.php          | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 338efe92a..65c1a25ee 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1058,10 +1058,6 @@ class ProjectController extends AbstractController
             $query->where('project_users.owner', 1);
             $query->where('project_users.userid', $userid);
         });
-        $builder->leftJoin('project_task_users as project_sub_task_users', function ($query) use($userid) {
-            $query->on('project_sub_task_users.task_pid', '=', 'project_tasks.parent_id');
-            $query->where('project_sub_task_users.userid', $userid);
-        });
         $builder->leftJoin('project_task_visibility_users', function ($query) use($userid) {
             $query->on('project_task_visibility_users.task_id', '=', 'project_tasks.id');
             $query->where('project_task_visibility_users.userid', $userid);
@@ -1071,7 +1067,6 @@ class ProjectController extends AbstractController
             $query->orWhere("project_users.userid", $userid);
             $query->orWhere("project_task_users.userid", $userid);
             $query->orWhere("project_task_visibility_users.userid", $userid);
-            $query->orWhere("project_sub_task_users.userid", $userid);
         });
         // 优化子查询汇总
         $builder->leftJoinSub(function ($query) {
diff --git a/app/Observers/ProjectTaskObserver.php b/app/Observers/ProjectTaskObserver.php
index d6ecb19fa..d31701e93 100644
--- a/app/Observers/ProjectTaskObserver.php
+++ b/app/Observers/ProjectTaskObserver.php
@@ -92,7 +92,7 @@ class ProjectTaskObserver
         }
         $array = [];
         if (in_array('task', $dataType)) {
-            $array = array_merge($array, ProjectTaskUser::whereTaskId($projectTask->id)->pluck('userid')->toArray());
+            $array = array_merge($array, ProjectTaskUser::whereTaskId($projectTask->id)->orWhere('task_pid' ,$projectTask->id)->pluck('userid')->toArray());
         }
         if (in_array('visibility', $dataType)) {
             $array = array_merge($array, ProjectTaskVisibilityUser::whereTaskId($projectTask->id)->pluck('userid')->toArray());
@@ -113,7 +113,7 @@ class ProjectTaskObserver
                 break;
             case 2:
             case 3:
-                $dataType = $projectTask->visibility == 2 ? ['task'] : ['task', 'visibility'];
+                $dataType = $projectTask->visibility == 2 ? ['task'] : ['visibility'];
                 $forgetUserids = self::userids($projectTask, $dataType);
                 $projectOwnerUserIds = self::userids($projectTask, 'projectOwnerUser');
                 $recordUserids = array_diff($projectUserids, $forgetUserids, $projectOwnerUserIds);