Merge branch 'sprint/174_xieqiyu_45015' into 'master'

* Finish task#45015.

See merge request easycorp/zentaopms!681
This commit is contained in:
李玉春
2021-12-01 00:40:33 +00:00
+1 -1
View File
@@ -189,7 +189,7 @@ class testreport extends control
$taskPairs = array();
$scopeAndStatus[0] = 'local';
$scopeAndStatus[1] = 'totalStatus';
$tasks = $this->testtask->getProductTasks($productID, 0, 'id_desc', null, $scopeAndStatus);
$tasks = $this->testtask->getProductTasks($productID, $task->branch, 'id_desc', null, $scopeAndStatus);
foreach($tasks as $testTask)
{
if($testTask->build == 'trunk') continue;