diff --git a/module/testcase/js/browse.ui.js b/module/testcase/js/browse.ui.js
index c5e03367e3..d05f983092 100644
--- a/module/testcase/js/browse.ui.js
+++ b/module/testcase/js/browse.ui.js
@@ -183,9 +183,9 @@ window.onRenderCell = function(result, {row, col})
         {
             result[0] = {html:  '<span style="color:#ff6f42">' + caseChanged + '</span>'};
         }
-        if(col.name == 'story')
+        if(col.name == 'story' && row.data.story > 0)
         {
-            if(row.data.story > 0) result[0] = {html: `<a href="${$.createLink('story', 'view', `storyID=${row.data.story}`)}">${row.data.storyTitle}</a>`};
+            result[0] = {html: `<a href="${$.createLink('story', 'view', `storyID=${row.data.story}`)}">${row.data.storyTitle}</a>`};
         }
     }
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 48f1980c34..2ef843cce2 100755
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -354,6 +354,9 @@ class testcaseModel extends model
 
         $caseQuery .= ')';
 
+        // 将caseQuery中的字段替换成t1.字段
+        $caseQuery = preg_replace('/`(.*?)`/', 't1.`$1`', $caseQuery);
+
         /* Search criteria under compatible project. */
         $sql = $this->dao->select('t1.*,t3.title as storyTitle')->from(TABLE_CASE)->alias('t1');
         if($this->app->tab == 'project') $sql->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id = t2.case');