diff --git a/module/story/control.php b/module/story/control.php index 9dbb2aa8d6..2c72a9d3bc 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -3135,14 +3135,15 @@ class story extends control */ public function ajaxGetProductUserStories($productID, $branchID = 0, $requirementList = 0) { - $URS = $this->story->getProductStoryPairs($productID, $branchID, 0, 'active,launched', 'id_desc', 0, '', 'requirement'); + $URS = $this->story->getProductStoryPairs($productID, $branchID, 0, 'active,launched', 'id_desc', 0, '', 'requirement'); + $project = $this->loadModel('project')->getById($this->session->project); - /* 获取当前项目下研发中的需求。*/ - /* Get developing requirements.*/ - if($this->config->vision and $this->app->tab == 'project') + /* 获取ipd项目下研发中的需求。*/ + /* Get ipd project developing requirements.*/ + if($project->model == 'ipd' and $this->app->tab == 'project') { $developingURS = $this->story->getExecutionStoryPairs($this->session->project, $productID, $branchID, 0, '', 'developing', 'requirement'); - $URS = array_merge($developingURS, $URS); + $URS = $developingURS + $URS; } return print(html::select('URS[]', $URS, $requirementList, "class='form-control chosen' multiple")); }