diff --git a/module/upgrade/tao.php b/module/upgrade/tao.php
index 5ae88e79c8..6cc85c106c 100644
--- a/module/upgrade/tao.php
+++ b/module/upgrade/tao.php
@@ -284,7 +284,7 @@ class upgradeTao extends upgradeModel
             ->from(TABLE_ACTION)
             ->where('objectType')->eq('story')
             ->andWhere('action')->eq('linked2release')
-            ->groupBy('objectID')
+            ->groupBy('objectID,extra,action')
             ->get();
     }
 
diff --git a/module/upgrade/test/model/createprogram.php b/module/upgrade/test/model/createprogram.php
index 7408b36afd..0d13cd4465 100755
--- a/module/upgrade/test/model/createprogram.php
+++ b/module/upgrade/test/model/createprogram.php
@@ -27,6 +27,9 @@ include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/lib/upgrade.unittest.class.php';
 
 su('admin');
+global $app;
+include($app->getModuleRoot() . '/upgrade/control.php');
+$app->control = new upgrade();
 
 $project = zenData('project');
 $project->name->range('项目集1,项目1,项目2,项目3');
@@ -57,4 +60,4 @@ r($upgrade->createProgramTest($data, $projectIdList)) && p('0,1,2') && e('1,0,1'
 $data->sprints  = '1,2,3';
 $data->projects = 2;
 $data->projectStatus = 'closed';
-r($upgrade->createProgramTest($data, $projectIdList)) && p('0,1,2') && e('1,2,1'); // 测试选择项目集1，选择项目2，选择产品线1时
\ No newline at end of file
+r($upgrade->createProgramTest($data, $projectIdList)) && p('0,1,2') && e('1,2,1'); // 测试选择项目集1，选择项目2，选择产品线1时
diff --git a/module/upgrade/test/model/parsetosqls.php b/module/upgrade/test/model/parsetosqls.php
index 7f6eb129c3..086eeb2679 100644
--- a/module/upgrade/test/model/parsetosqls.php
+++ b/module/upgrade/test/model/parsetosqls.php
@@ -7,11 +7,11 @@ declare(strict_types=1);
 title=测试 upgradeModel->parseToSqls();
 cid=1
 
-- 测试将 18.1 的升级 sql 文件转为 sql 语句 获取前30个字符 @DELETE FROM `zt_config` WHERE 
+- 测试将 18.1 的升级 sql 文件转为 sql 语句 获取前30个字符 @DELETE FROM `zt_config` WHERE
 - 测试将 18.2 的升级 sql 文件转为 sql 语句 获取前30个字符 @ALTER TABLE `zt_lang` MODIFY C
 - 测试将 18.3 的升级 sql 文件转为 sql 语句 获取前30个字符 @DELETE FROM `zt_chart` where i
 - 测试将 18.4 的升级 sql 文件转为 sql 语句 获取前30个字符 @REPLACE INTO `zt_priv` (`modul
-- 测试将 18.5 的升级 sql 文件转为 sql 语句 获取前30个字符 @UPDATE `zt_chart` SET `sql` = 
+- 测试将 18.5 的升级 sql 文件转为 sql 语句 获取前30个字符 @UPDATE `zt_chart` SET `sql` =
 
 **/
 
@@ -25,4 +25,4 @@ r($upgrade->parseToSqlsTest($versions[0])) && p() && e('DELETE FROM `zt_config`
 r($upgrade->parseToSqlsTest($versions[1])) && p() && e('ALTER TABLE `zt_lang` MODIFY C'); // 测试将 18.2 的升级 sql 文件转为 sql 语句 获取前30个字符
 r($upgrade->parseToSqlsTest($versions[2])) && p() && e('DELETE FROM `zt_chart` where i'); // 测试将 18.3 的升级 sql 文件转为 sql 语句 获取前30个字符
 r($upgrade->parseToSqlsTest($versions[3])) && p() && e('REPLACE INTO `zt_priv` (`modul'); // 测试将 18.4 的升级 sql 文件转为 sql 语句 获取前30个字符
-r($upgrade->parseToSqlsTest($versions[4])) && p() && e('UPDATE `zt_chart` SET `sql` = '); // 测试将 18.5 的升级 sql 文件转为 sql 语句 获取前30个字符
+r($upgrade->parseToSqlsTest($versions[4])) && p() && e('ALTER TABLE `zt_privrelation`');   // 测试将 18.5 的升级 sql 文件转为 sql 语句 获取前30个字符
diff --git a/module/upgrade/test/model/seturswitchstatus.php b/module/upgrade/test/model/seturswitchstatus.php
index 909729bc27..d0d9cea739 100644
--- a/module/upgrade/test/model/seturswitchstatus.php
+++ b/module/upgrade/test/model/seturswitchstatus.php
@@ -25,7 +25,6 @@ $versionList = array('18.1', '18.3', 'biz8.1', 'biz8.3', 'max4.1', 'max4.3');
 function getResult()
 {
     global $tester;
-    unset(dao::$cache['zt_config']);
     return $tester->dao->select('value')
         ->from('zt_config')
         ->where('owner')->eq('system')