diff --git a/module/testcase/config.php b/module/testcase/config.php
index c5cadcf6f0..283c36ac00 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -37,7 +37,7 @@ $config->testcase->excludeCheckFileds = ',pri,type,stage,needReview,story,branch
 global $lang;
 $config->testcase->search['module']                   = 'testcase';
 $config->testcase->search['fields']['title']          = $lang->testcase->title;
-$config->testcase->search['fields']['storyTitle']     = $lang->testcase->linkStory;
+$config->testcase->search['fields']['story']          = $lang->testcase->linkStory;
 $config->testcase->search['fields']['id']             = $lang->testcase->id;
 $config->testcase->search['fields']['keywords']       = $lang->testcase->keywords;
 $config->testcase->search['fields']['lastEditedBy']   = $lang->testcase->lastEditedByAB;
@@ -59,7 +59,7 @@ $config->testcase->search['fields']['openedDate']     = $lang->testcase->openedD
 $config->testcase->search['fields']['lastEditedDate'] = $lang->testcase->lastEditedDateAB;
 
 $config->testcase->search['params']['title']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
-$config->testcase->search['params']['storyTitle']   = array('operator' => 'include', 'control' => 'input',  'values' => '');
+$config->testcase->search['params']['story']        = array('operator' => 'include', 'control' => 'select', 'values' => '');
 $config->testcase->search['params']['module']       = array('operator' => 'belong',  'control' => 'select', 'values' => 'modules');
 $config->testcase->search['params']['keywords']     = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->testcase->search['params']['lastEditedBy'] = array('operator' => '=',       'control' => 'select', 'values' => 'users');
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 1c865a72e3..ad64811882 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -13,6 +13,7 @@ $lang->testcase->id               = 'ID';
 $lang->testcase->product          = $lang->productCommon;
 $lang->testcase->project          = 'Project';
 $lang->testcase->execution        = 'Execution';
+$lang->testcase->linkStory        = 'linkStory';
 $lang->testcase->module           = 'Module';
 $lang->testcase->auto             = 'Test Automation Cases';
 $lang->testcase->frame            = 'Test Automation Cramework';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index b50993b46c..72e5991595 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -13,6 +13,7 @@ $lang->testcase->id               = 'ID';
 $lang->testcase->product          = $lang->productCommon;
 $lang->testcase->project          = 'Project';
 $lang->testcase->execution        = 'Execution';
+$lang->testcase->linkStory        = 'linkStory';
 $lang->testcase->module           = 'Module';
 $lang->testcase->auto             = 'Test Automation Cases';
 $lang->testcase->frame            = 'Test Automation Cramework';
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index da07973081..670943aee9 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -13,6 +13,7 @@ $lang->testcase->id               = 'ID';
 $lang->testcase->product          = $lang->productCommon;
 $lang->testcase->project          = 'Project';
 $lang->testcase->execution        = 'Execution';
+$lang->testcase->linkStory        = 'linkStory';
 $lang->testcase->module           = 'Module';
 $lang->testcase->auto             = 'Test Automation Cases';
 $lang->testcase->frame            = 'Test Automation Cramework';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 835cedb468..956d9281f3 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -13,6 +13,7 @@ $lang->testcase->id               = '用例编号';
 $lang->testcase->product          = "所属{$lang->productCommon}";
 $lang->testcase->project          = '所属项目';
 $lang->testcase->execution        = '所属执行';
+$lang->testcase->linkStory        = '关联需求';
 $lang->testcase->module           = '所属模块';
 $lang->testcase->auto             = '自动化测试用例';
 $lang->testcase->frame            = '自动化测试框架';
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 8eb9073e49..7995699047 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1112,8 +1112,17 @@ class testtask extends control
         $this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type&param=$param");
         $this->config->testcase->search['style']     = 'simple';
 
+        $build   = $this->loadModel('build')->getByID($task->build);
+        $stories = array();
+        if($build)
+        {
+            $stories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($build->stories)->fetchPairs();
+            $this->config->testcase->search['params']['story']['values'] = $stories;
+            $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
+        }
+
         if($product->shadow) unset($this->config->testcase->search['fields']['product']);
-        if($type != 'bystory') unset($this->config->testcase->search['fields']['storyTitle']);
+        if($type != 'bystory') unset($this->config->testcase->search['fields']['story']);
         if($task->productType == 'normal')
         {
             unset($this->config->testcase->search['fields']['branch']);
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index fa6ab7c3ad..481fabdaa5 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -131,7 +131,6 @@ $lang->testtask->priList[2] = '2';
 $lang->testtask->priList[3] = '3';
 $lang->testtask->priList[4] = '4';
 
-$lang->testcase->linkStory     = 'linkStory';
 $lang->testtask->unlinkedCases = 'Unverknüpfte Fälle';
 $lang->testtask->linkByBuild   = 'Mit Build verknüpfen';
 $lang->testtask->linkByStory   = 'Mit Story verknüpfen';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 08f54f1403..28a1f09374 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -131,7 +131,6 @@ $lang->testtask->priList[2] = '2';
 $lang->testtask->priList[3] = '3';
 $lang->testtask->priList[4] = '4';
 
-$lang->testcase->linkStory     = 'linkStory';
 $lang->testtask->unlinkedCases = 'Unlinked Case';
 $lang->testtask->linkByBuild   = 'Copy from build';
 $lang->testtask->linkByStory   = 'Link by Story';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 36b9f0f3f5..40eaf40f0f 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -131,7 +131,6 @@ $lang->testtask->priList[2] = '2';
 $lang->testtask->priList[3] = '3';
 $lang->testtask->priList[4] = '4';
 
-$lang->testcase->linkStory     = 'linkStory';
 $lang->testtask->unlinkedCases = 'CasTests Non rattachés';
 $lang->testtask->linkByBuild   = 'Copier depuis build';
 $lang->testtask->linkByStory   = 'Lier par Story';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 33759d1927..74c93f4342 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -131,7 +131,6 @@ $lang->testtask->priList[2] = '2';
 $lang->testtask->priList[3] = '3';
 $lang->testtask->priList[4] = '4';
 
-$lang->testcase->linkStory     = '关联需求';
 $lang->testtask->unlinkedCases = '未关联';
 $lang->testtask->linkByBuild   = '复制测试单';
 $lang->testtask->linkByStory   = "按{$lang->SRCommon}关联";