diff --git a/module/product/model.php b/module/product/model.php
index f5191622e1..81a341464f 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1300,14 +1300,22 @@ class productModel extends model
     {
         $projectList = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->leftJoin(TABLE_TEAM)->alias('t3')->on('t2.id=t3.root')
+            ->leftJoin(TABLE_STAKEHOLDER)->alias('t4')->on('t2.id=t4.objectID')
             ->where('t1.product')->eq($productID)
             ->andWhere('t2.type')->eq('project')
+            ->beginIF($this->cookie->involved or $involved)->andWhere('t3.type')->eq('project')->fi()
             ->beginIF($browseType == 'undone')->andWhere('t2.status')->in('wait,doing')->fi()
             ->beginIF(strpos(",all,undone,", ",$browseType,") === false)->andWhere('t2.status')->eq($browseType)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
             ->beginIF($this->cookie->involved or $involved)
             ->andWhere('t2.openedBy', true)->eq($this->app->user->account)
             ->orWhere('t2.PM')->eq($this->app->user->account)
+            ->orWhere('t3.account')->eq($this->app->user->account)
+            ->orWhere('(t4.user')->eq($this->app->user->account)
+            ->andWhere('t4.deleted')->eq(0)
+            ->markRight(1)
+            ->orWhere("CONCAT(',', t2.whitelist, ',')")->like("%,{$this->app->user->account},%")
             ->markRight(1)
             ->fi()
             ->beginIF($branch !== '' and $branch !== 'all')->andWhere('t1.branch')->in($branch)->fi()
diff --git a/module/program/model.php b/module/program/model.php
index bbb4068e16..0fd073c6ca 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -615,7 +615,9 @@ class programModel extends model
             ->andWhere('t1.openedBy', true)->eq($this->app->user->account)
             ->orWhere('t1.PM')->eq($this->app->user->account)
             ->orWhere('t2.account')->eq($this->app->user->account)
-            ->orWhere('t3.user')->eq($this->app->user->account)
+            ->orWhere('(t3.user')->eq($this->app->user->account)
+            ->andWhere('t3.deleted')->eq(0)
+            ->markRight(1)
             ->orWhere("CONCAT(',', t1.whitelist, ',')")->like("%,{$this->app->user->account},%")
             ->markRight(1)
             ->fi()