Merge branch 'sgm_fixbug' into 'master'

* Fix kanban bug. See merge request easycorp/zentaopms!1469
2022-01-18 05:25:33 +00:00
parent 266341191b 625f3e6d59
commit 3f370bad4c
2 changed files with 2 additions and 1 deletions
@@ -840,6 +840,7 @@ class kanbanModel extends model
            ->andWhere("INSTR(t2.cards, CONCAT(',',t1.id,','))")->gt(0)
            ->andWhere('archived')->eq(0)
            ->andWhere('t2.kanban')->eq($kanbanID)
+            ->andWhere('t2.type')->eq('common')
            //->orderBy('`order` asc')
            ->fetchAll('id');

@@ -5401,7 +5401,7 @@ class upgradeModel extends model
            $cell->kanban = $key[0];
            $cell->lane   = $key[1];
            $cell->column = $key[2];
-            $cell->type   = 'card';
+            $cell->type   = 'common';
            $cell->cards  = $cards;

            $this->dao->insert(TABLE_KANBANCELL)->data($cell)->exec();