From d52bb5da5ca59c57f40f5d33fd4674484cb7a2d9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 28 Oct 2015 14:54:48 +0800 Subject: [PATCH] * finish task #2349. --- module/story/model.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index c5971451d7..880539e14f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1121,8 +1121,7 @@ class storyModel extends model */ public function getWillClose($productID, $branch, $orderBy, $pager) { - return $this->dao->select('t1.*, t2.title as planTitle') - ->from(TABLE_STORY)->alias('t1') + $stories = $this->dao->select('t1.*, t2.title as planTitle')->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_PRODUCTPLAN)->alias('t2')->on('t1.plan = t2.id') ->where('t1.product')->in($productID) ->andWhere('t1.deleted')->eq(0) @@ -1130,7 +1129,10 @@ class storyModel extends model ->andWhere('status')->ne('closed') ->orderBy($orderBy) ->page($pager) - ->fetchAll(); + ->fetchAll('id'); + $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in(array_keys($stories))->andWhere('stage')->notIN('released')->fetchPairs('story', 'story'); + foreach($stages as $storyID) unset($stories[$storyID]); + return $stories; } /**