From fdc85bbcbf06e07427ba113edc9482328866f02d Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 26 Dec 2023 20:52:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E4=BF=AE=E5=A4=8D=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E6=95=88=E6=95=B0=E6=8D=AE=E5=8F=96=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?2.=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=E6=95=88=E6=8C=87=E5=AE=9A=E4=BA=BA=E5=91=98=E4=B8=8D=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/ProjectTask.php                               | 9 +++++++--
 .../assets/js/pages/manage/components/TaskDetail.vue     | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 677d9ba40..128f4e258 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -288,7 +288,8 @@ class ProjectTask extends AbstractModel
             ->leftJoin('project_task_users', function ($leftJoin) use ($userid) {
                 $leftJoin
                     ->on('project_task_users.userid', '=', DB::raw($userid))
-                    ->on('project_tasks.id', '=', 'project_task_users.task_id');
+                    ->on('project_tasks.id', '=', 'project_task_users.task_id')
+                    ->where('project_task_users.owner', '<', 2);
             });
         return $query;
     }
@@ -309,7 +310,11 @@ class ProjectTask extends AbstractModel
                 'project_task_users.owner'
             ])
             ->selectRaw("1 AS assist")
-            ->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id')
+            ->join('project_task_users', function ($leftJoin) {
+                $leftJoin
+                    ->on('project_tasks.id', '=', 'project_task_users.task_id')
+                    ->where('project_task_users.owner', '<', 2);
+            })
             ->where('project_task_users.userid', $userid);
         if ($owner !== null) {
             $query->where('project_task_users.owner', $owner);
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 908bca075..4e2fd1a6f 100755
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -914,7 +914,7 @@ export default {
         },
         "taskDetail.visibility_appointor": {
             handler(arr) {
-                if(arr?.length > 0 && arr[0]) {
+                if (arr?.filter(id=>id).length > 0) {
                     this.taskDetail.visibility = 3
                     this.updateVisible()
                 }
@@ -1696,10 +1696,10 @@ export default {
         },
 
         visibleUserSelectShowChange(isShow){
-            if(!isShow && (this.taskDetail.visibility_appointor.length == 0 || !this.taskDetail.visibility_appointor[0])){
+            if (!isShow && this.taskDetail.visibility_appointor.filter(id => id).length == 0) {
                 let old = this.taskDetail.old_visibility;
                 this.taskDetail.visibility = old > 2 ? 1 : (old || 1);
-                if(this.taskDetail.visibility < 3 ){
+                if (this.taskDetail.visibility < 3) {
                     this.updateVisible();
                 }
             }