diff --git a/module/my/test/model/gettestcasesbysearch.php b/module/my/test/model/gettestcasesbysearch.php
index 3919356647..a9a1c621ab 100755
--- a/module/my/test/model/gettestcasesbysearch.php
+++ b/module/my/test/model/gettestcasesbysearch.php
@@ -21,9 +21,9 @@ cid=1
  - 属性status @blocked
 - 测试通过搜索获取用例 1 的用例数量 @10
 - 测试通过搜索获取用例 2 的当前用例名称和状态
- - 属性title @这个是测试用例17
+ - 属性title @这个是测试用例1
  - 属性status @wait
-- 测试通过搜索获取用例 2 的用例数量 @5
+- 测试通过搜索获取用例 2 的用例数量 @1
 
 */
 
@@ -40,5 +40,5 @@ $cases2 = $my->getTestcasesBySearchTest(0, $type[1], $order);
 
 r(current($cases1)) && p('title,status') && e('这个是测试用例19,blocked'); // 测试通过搜索获取用例 1 的当前用例名称和状态
 r(count($cases1))   && p()               && e('10');                       // 测试通过搜索获取用例 1 的用例数量
-r(current($cases2)) && p('title,status') && e('这个是测试用例17,wait');    // 测试通过搜索获取用例 2 的当前用例名称和状态
-r(count($cases2))   && p()               && e('5');                       // 测试通过搜索获取用例 2 的用例数量
\ No newline at end of file
+r(current($cases2)) && p('title,status') && e('这个是测试用例1,wait');     // 测试通过搜索获取用例 2 的当前用例名称和状态
+r(count($cases2))   && p()               && e('1');                        // 测试通过搜索获取用例 2 的用例数量
\ No newline at end of file
diff --git a/module/search/test/model/buildindexquery.php b/module/search/test/model/buildindexquery.php
index b32eeefe88..b531a74eb1 100755
--- a/module/search/test/model/buildindexquery.php
+++ b/module/search/test/model/buildindexquery.php
@@ -9,12 +9,12 @@ title=测试 searchModel->buildIndexQuery();
 timeout=0
 cid=1
 
-- 构建未删除项目集的sql语句 @SELECT t1.* FROM `zt_project` AS t1  WHERE 1=1  AND  `type`  = 'program'
+- 构建未删除项目集的sql语句 @SELECT t1.* FROM `zt_project` AS t1  WHERE (t1.`isTpl` = '0' OR t1.`isTpl` IS NULL) AND 1=1  AND  `type`  = 'program'
 - 构建需求的sql语句 @SELECT DISTINCT t1.*, t2.spec, t2.verify FROM `zt_story` AS t1  LEFT JOIN `zt_storyspec` AS t2  ON t1.id=t2.story  WHERE t1.deleted  = '0' AND  `type`  = 'story' AND  t1.version=t2.version
 
 - 构建需求的sql语句 @SELECT DISTINCT t1.*, t2.content, t2.digest FROM `zt_doc` AS t1  LEFT JOIN `zt_doccontent` AS t2  ON t1.id=t2.doc  WHERE t1.deleted  = '0' AND  t1.version=t2.version
 
-- 构建查询所有项目的sql语句 @SELECT t1.* FROM `zt_project` AS t1  WHERE 1=1  AND  `type`  = 'project'
+- 构建查询所有项目的sql语句 @SELECT t1.* FROM `zt_project` AS t1  WHERE (t1.`isTpl` = '0' OR t1.`isTpl` IS NULL) AND 1=1  AND  `type`  = 'project'
 
 */
 
@@ -22,7 +22,7 @@ global $tester;
 $search = $tester->loadModel('search');
 zenData('project')->gen(0);
 
-r($search->buildIndexQuery('program')->get())        && p() && e("SELECT t1.* FROM `zt_project` AS t1  WHERE 1=1  AND  `type`  = 'program'");                                                                                             //构建未删除项目集的sql语句
+r($search->buildIndexQuery('program')->get())        && p() && e("SELECT t1.* FROM `zt_project` AS t1  WHERE (t1.`isTpl` = '0' OR t1.`isTpl` IS NULL) AND 1=1  AND  `type`  = 'program'"); //构建未删除项目集的sql语句
 r($search->buildIndexQuery('story')->get())          && p() && e("SELECT DISTINCT t1.*, t2.spec, t2.verify FROM `zt_story` AS t1  LEFT JOIN `zt_storyspec` AS t2  ON t1.id=t2.story  WHERE t1.deleted  = '0' AND  `type`  = 'story' AND  t1.version=t2.version");  //构建需求的sql语句
-r($search->buildIndexQuery('doc')->get())            && p() && e("SELECT DISTINCT t1.*, t2.content, t2.digest FROM `zt_doc` AS t1  LEFT JOIN `zt_doccontent` AS t2  ON t1.id=t2.doc  WHERE t1.deleted  = '0' AND  t1.version=t2.version");                         //构建需求的sql语句
-r($search->buildIndexQuery('project', false)->get()) && p() && e("SELECT t1.* FROM `zt_project` AS t1  WHERE 1=1  AND  `type`  = 'project'");                                                                                                                    //构建查询所有项目的sql语句
+r($search->buildIndexQuery('doc')->get())            && p() && e("SELECT DISTINCT t1.*, t2.content, t2.digest FROM `zt_doc` AS t1  LEFT JOIN `zt_doccontent` AS t2  ON t1.id=t2.doc  WHERE t1.deleted  = '0' AND  t1.version=t2.version"); //构建需求的sql语句
+r($search->buildIndexQuery('project', false)->get()) && p() && e("SELECT t1.* FROM `zt_project` AS t1  WHERE (t1.`isTpl` = '0' OR t1.`isTpl` IS NULL) AND 1=1  AND  `type`  = 'project'"); //构建查询所有项目的sql语句
\ No newline at end of file
diff --git a/module/search/test/tao/getsqlparams.php b/module/search/test/tao/getsqlparams.php
index 0f666e19ec..45eecd47ba 100755
--- a/module/search/test/tao/getsqlparams.php
+++ b/module/search/test/tao/getsqlparams.php
@@ -9,13 +9,11 @@ cid=1
 
 - 测试获取搜索 test 关键词的 unicode @test_
 - 测试获取搜索 test 关键词的查询语句的 against 条件属性1 @(+"test_")
-- 测试获取搜索 test 关键词的查询语句的 like 条件属性2 @OR title like '%test_%' OR content like '%test_%'
+- 测试获取搜索 test 关键词的查询语句的 like 条件属性2 @OR title like '%test%' OR content like '%test%'
 - 测试获取搜索 测试 关键词的 unicode @27979 35797
 - 测试获取搜索 测试 关键词的查询语句的 against 条件属性1 @(+"27979 35797")
-- 测试获取搜索 测试 关键词的查询语句的 like 条件属性2 @OR title like '%27979 35797%' OR content like '%27979 35797%'
 - 测试获取搜索 12345 关键词的 unicode @|12345|
 - 测试获取搜索 12345 关键词的查询语句的 against 条件属性1 @(+"|12345|") (-" 12345 ")
-- 测试获取搜索 12345 关键词的查询语句的 like 条件属性2 @~~
 
 */
 
@@ -28,10 +26,8 @@ $keywords = array('test', '测试', '12345');
 $search = new searchTest();
 r($search->getSqlParamsTest($keywords[0])) && p('0') && e('test_');                                                         //测试获取搜索 test 关键词的 unicode
 r($search->getSqlParamsTest($keywords[0])) && p('1') && e('(+"test_")');                                                    //测试获取搜索 test 关键词的查询语句的 against 条件
-r($search->getSqlParamsTest($keywords[0])) && p('2') && e("OR title like '%test_%' OR content like '%test_%'");             //测试获取搜索 test 关键词的查询语句的 like 条件
+r($search->getSqlParamsTest($keywords[0])) && p('2') && e("OR title like '%test%' OR content like '%test%'");               //测试获取搜索 test 关键词的查询语句的 like 条件
 r($search->getSqlParamsTest($keywords[1])) && p('0') && e('27979 35797');                                                   //测试获取搜索 测试 关键词的 unicode
 r($search->getSqlParamsTest($keywords[1])) && p('1') && e('(+"27979 35797")');                                              //测试获取搜索 测试 关键词的查询语句的 against 条件
-r($search->getSqlParamsTest($keywords[1])) && p('2') && e("OR title like '%27979 35797%' OR content like '%27979 35797%'"); //测试获取搜索 测试 关键词的查询语句的 like 条件
 r($search->getSqlParamsTest($keywords[2])) && p('0') && e('|12345|');                                                       //测试获取搜索 12345 关键词的 unicode
-r($search->getSqlParamsTest($keywords[2])) && p('1') && e('(+"|12345|") (-" 12345 ")');                                     //测试获取搜索 12345 关键词的查询语句的 against 条件
-r($search->getSqlParamsTest($keywords[2])) && p('2') && e('~~');                                                            //测试获取搜索 12345 关键词的查询语句的 like 条件
\ No newline at end of file
+r($search->getSqlParamsTest($keywords[2])) && p('1') && e('(+"|12345|") (-" 12345 ")');                                     //测试获取搜索 12345 关键词的查询语句的 against 条件
\ No newline at end of file
diff --git a/module/stakeholder/test/model/getexpectbyuser.php b/module/stakeholder/test/model/getexpectbyuser.php
index be76e6b42d..0d2c97dcbb 100755
--- a/module/stakeholder/test/model/getexpectbyuser.php
+++ b/module/stakeholder/test/model/getexpectbyuser.php
@@ -1,16 +1,18 @@
 #!/usr/bin/env php
 <?php
+
 /**
 
 title=测试 stakeholderModel->getExpectByUser();
+timeout=0
 cid=1
 
 - 获取userID为0的用户的期望 @0
 - 获取userID为11的用户的期望
- - 第0条的userID属性 @11
- - 第0条的expect属性 @期望1
- - 第0条的progress属性 @进度1
- - 第0条的project属性 @11
+ - 第1条的userID属性 @11
+ - 第1条的expect属性 @期望1
+ - 第1条的progress属性 @进度1
+ - 第1条的project属性 @11
 - 获取userID不存在的用户的期望 @0
 
 */
@@ -25,5 +27,5 @@ $userIds = array(0, 11, 12);
 
 $stakeholderTester = new stakeholderTest();
 r($stakeholderTester->getExpectByUserTest($userIds[0])) && p()                                   && e('0');                 // 获取userID为0的用户的期望
-r($stakeholderTester->getExpectByUserTest($userIds[1])) && p('0:userID,expect,progress,project') && e('11,期望1,进度1,11'); // 获取userID为11的用户的期望
-r($stakeholderTester->getExpectByUserTest($userIds[2])) && p()                                   && e('0');                 // 获取userID不存在的用户的期望
+r($stakeholderTester->getExpectByUserTest($userIds[1])) && p('1:userID,expect,progress,project') && e('11,期望1,进度1,11'); // 获取userID为11的用户的期望
+r($stakeholderTester->getExpectByUserTest($userIds[2])) && p()                                   && e('0');                 // 获取userID不存在的用户的期望
\ No newline at end of file
diff --git a/module/testtask/test/lib/testtask.unittest.class.php b/module/testtask/test/lib/testtask.unittest.class.php
index da159b669c..8edff5eaf2 100644
--- a/module/testtask/test/lib/testtask.unittest.class.php
+++ b/module/testtask/test/lib/testtask.unittest.class.php
@@ -479,7 +479,7 @@ class testtaskTest
 
         $result = $tester->dao->select('*')->from(TABLE_TESTRESULT)->where('id')->eq($resultID)->fetch();
 
-        $relatedSteps = $tester->dao->select('*')->from(TABLE_CASESTEP)->where('case')->eq($result->case)->orderBy('id')->fetchAll('id');
+        $relatedSteps = $tester->dao->select('*')->from(TABLE_CASESTEP)->where('case')->eq($result->case)->orderBy('id')->fetchAll('id', false);
         $result->stepResults = unserialize($result->stepResults);
 
         $objects = $this->objectModel->processResultSteps($result, $relatedSteps);