Merge branch 'sgm_fixbug' into 'master'

* Fix kanban bug. See merge request easycorp/zentaopms!823
2021-12-08 05:10:01 +00:00
parent 5d02d686cd c1f2a2272f
commit 0c4f0dc504
2 changed files with 19 additions and 21 deletions
@@ -189,6 +189,7 @@ class programModel extends model
            ->where('t2.deleted')->eq(0)
            ->andWhere('t1.product')->in($productPairs)
            ->andWhere('t2.type')->eq('project')
+            ->andWhere('t2.status')->in('wait,doing')
            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
            ->fetchGroup('product');