diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index d7b7adb61c..01660ecb9b 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -42,7 +42,7 @@
- + - + @@ -138,7 +138,9 @@ + + diff --git a/module/story/model.php b/module/story/model.php index 198950d3e8..89a1335fb1 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -82,8 +82,12 @@ class storyModel extends model */ public function getByList($storyIdList = 0, $type = 'story') { - return $this->dao->select('t1.*, t2.spec, t2.verify')->from(TABLE_STORY)->alias('t1') + return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle') + ->markLeft() + ->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story') + ->markRight() + ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id') ->where('t1.deleted')->eq(0) ->andWhere('t1.version=t2.version') ->beginIF($storyIdList)->andWhere('t1.id')->in($storyIdList)->fi()
priAB);?> story->product);?> story->title);?> my->name);?> story->plan);?> lang->story->children .'">' . $this->lang->story->childrenAB . ' ' . html::a($storyLink, $child->title, null, "style='color: $child->color'");?> planTitle;?> openedBy);?> estimate;?> processStatus('story', $child);?>