Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug#113.

Browse Source
This commit is contained in:
wangchunsheng
2011-11-22 03:23:10 +00:00
parent 1818e2a97b
commit 077686af36
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/story/model.php
View File

@@ -704,20 +704,22 @@ class storyModel extends model
->andWhere('deleted')->eq(0)
->orderBy($orderBy)
->page($pager)
->fetchGroup('plan');
->fetchAll('id');
$this->saveReportQuery($this->dao->get());
if(!$tmpStories) return array();
$plans = $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('id')->in(array_keys($tmpStories))->fetchPairs();
/* Get plans. */
$plans = array();
foreach($tmpStories as $story) $plans[$story->plan] = $story->plan;
$plans = $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('id')->in(array_keys($plans))->fetchPairs();
/* Process plans. */
$stories = array();
foreach($tmpStories as $planID => $planStories)
foreach($tmpStories as $story)
{
foreach($planStories as $story)
{
$story->planTitle = isset($plans[$planID]) ? $plans[$planID] : '';
$stories[] = $story;
}
$story->planTitle = isset($plans[$story->plan]) ? $plans[$story->plan] : '';
$stories[] = $story;
}
return $stories;
}