From fc081f1d216cd2b77f3dd4fe45ea7897e64930dd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 11 Jan 2022 10:03:22 +0800
Subject: [PATCH] * Modify the code logic.

---
 module/kanban/control.php |  2 +-
 module/kanban/model.php   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 2f85580c6d..8128003ac1 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -30,7 +30,7 @@ class kanban extends control
 
         $this->view->title       = $this->lang->kanbanspace->common;
         $this->view->spaceList   = $this->kanban->getSpaceList($browseType, $pager);
-        $this->view->allSpace    = $this->kanban->getSpaceList('noclosed');
+        $this->view->allSpace    = $this->kanban->getCanViewObjects('kanbanspace', 'noclosed');
         $this->view->browseType  = $browseType;
         $this->view->pager       = $pager;
         $this->view->users       = $this->loadModel('user')->getPairs('noletter|nodeleted');
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 6c581192e7..db458f9a22 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -970,10 +970,14 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function getCanViewObjects($objectType = 'kanban')
+    public function getCanViewObjects($objectType = 'kanban', $param = '')
     {
-        $table     = $this->config->objectTables[$objectType];
-        $objects   = $this->dao->select('*')->from($table)->fetchAll('id');
+        $table   = $this->config->objectTables[$objectType];
+        $objects = $this->dao->select('*')->from($table)
+            ->where('deleted')->eq(0)
+            ->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
+            ->fetchAll('id');
+
         $spaceList = $objectType == 'kanban' ? $this->dao->select('id,owner,team,whitelist')->from(TABLE_KANBANSPACE)->fetchAll('id') : array();
 
         if($this->app->user->admin) return array_keys($objects);