From 5bd18ec7612b4d3659b7eb3bf01dbed086e7dc99 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 19 Jan 2022 16:43:00 +0800
Subject: [PATCH] * Add conditional judgment.

---
 module/kanban/model.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/kanban/model.php b/module/kanban/model.php
index b13cd1bbce..92af56ceb0 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -862,9 +862,13 @@ class kanbanModel extends model
         $cards = $this->dao->select('*')->from(TABLE_KANBANCARD)->alias('t1')
             ->where('deleted')->eq(0)
             ->andWhere('kanban')->eq($kanbanID)
+            ->andWhere('archived')->eq(0)
             ->fetchAll('id');
 
-        $cellList = $this->dao->select('*')->from(TABLE_KANBANCELL)->where('kanban')->eq($kanbanID)->fetchAll();
+        $cellList = $this->dao->select('*')->from(TABLE_KANBANCELL)
+            ->where('kanban')->eq($kanbanID)
+            ->andWhere('type')->eq('common')
+            ->fetchAll();
 
         $actions   = array('editCard', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard');
         $cardGroup = array();
@@ -875,6 +879,8 @@ class kanbanModel extends model
             if(empty($cardIdList)) continue;
             foreach($cardIdList as $cardID)
             {
+                if(!isset($cards[$cardID])) continue;
+
                 $card = zget($cards, $cardID);
                 $card->actions = array();
                 foreach($actions as $action)