From e179c99ebcc0699b3760cb2e7f4b174c2ac0cd2b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 12 Oct 2018 14:23:57 +0800 Subject: [PATCH] * finish task #4969. --- module/project/model.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index 351275adb7..f9ad34c0f0 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2376,19 +2376,13 @@ class projectModel extends model */ public function getKanbanTasks($projectID, $orderBy = 'status_asc, id_desc', $pager = null) { - $parents = $this->dao->select('parent')->from(TABLE_TASK) - ->where('project')->eq((int)$projectID) - ->andWhere('deleted')->eq(0) - ->andWhere('parent')->ne(0) - ->fetchPairs('parent', 'parent'); - $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName') ->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id') ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account') ->where('t1.project')->eq((int)$projectID) ->andWhere('t1.deleted')->eq(0) - ->andWhere('t1.id')->notin($parents) + ->andWhere('t1.parent')->ge(0) ->orderBy($orderBy) ->page($pager) ->fetchAll();