From 9f3f0bd8c6025863919f97abd5af31927eefee0c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 24 Mar 2022 16:01:18 +0800
Subject: [PATCH] * Fix bug #20858.

---
 config/filter.php          | 1 +
 module/block/control.php   | 2 +-
 module/project/control.php | 3 ++-
 module/project/model.php   | 5 +++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index f70bda0018..308d9416bd 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -250,6 +250,7 @@ $filter->project->default->cookie['lastPRJ']             = 'int';
 $filter->project->default->cookie['projectMode']         = 'code';
 $filter->project->default->cookie['kanbanview']          = 'code';
 $filter->project->browse->cookie['involved']             = 'code';
+$filter->project->export->cookie['involved']             = 'code';
 $filter->project->browse->cookie['projectType']          = 'code';
 $filter->project->story->cookie['storyModuleParam']      = 'int';
 $filter->project->story->cookie['storyPreProjectID']     = 'int';
diff --git a/module/block/control.php b/module/block/control.php
index 7a5c2d85bf..d41c748bc5 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1823,7 +1823,7 @@ class block extends control
         /* load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 3, 1);
-        $this->view->projects = $this->loadModel('project')->getInfoList('all', 'id_desc', $pager);
+        $this->view->projects = $this->loadModel('project')->getInfoList('all', 'id_desc', $pager, 1);
     }
 
     /**
diff --git a/module/project/control.php b/module/project/control.php
index 32b106b0bc..536f36a537 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -53,7 +53,8 @@ class project extends control
                 unset($fields[$key]);
             }
 
-            $projects = $this->project->getInfoList($status, $orderBy);
+            $involved = $this->cookie->involved ? $this->cookie->involved : 0;
+            $projects = $this->project->getInfoList($status, $orderBy, '', $involved);
             $users    = $this->loadModel('user')->getPairs('noletter');
 
             $this->loadModel('product');
diff --git a/module/project/model.php b/module/project/model.php
index 6a7c3a1e6f..b269d98bc2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -193,13 +193,14 @@ class projectModel extends model
      * @param  string    $status
      * @param  string    $orderBy
      * @param  int       $pager
+     * @param  int       $involved
      * @access public
      * @return array
      */
-    public function getInfoList($status = 'undone', $orderBy = 'order_desc', $pager = null)
+    public function getInfoList($status = 'undone', $orderBy = 'order_desc', $pager = null, $involved = 0)
     {
         /* Init vars. */
-        $projects = $this->loadModel('program')->getProjectList(0, $status, 0, $orderBy, $pager, 0, 1);
+        $projects = $this->loadModel('program')->getProjectList(0, $status, 0, $orderBy, $pager, 0, $involved);
         if(empty($projects)) return array();
 
         $projectIdList = array_keys($projects);