* Finish story #48612.

2023-08-17 11:48:56 +08:00
parent 1737698afa
commit 0fed7fb36c
1 changed files with 3 additions and 1 deletions
@@ -544,10 +544,12 @@ class testreportModel extends model
        {
            foreach($builds as $build) $bugIdList .= $build->bugs . ',';
        }
+        $bugIdList = trim($bugIdList, ',');
+
        return $this->dao->select('*')->from(TABLE_BUG)->where('deleted')->eq(0)
            ->andWhere('product')->in($product)
            ->andWhere('openedDate')->lt("$begin 23:59:59")
-            ->andWhere("(id " . helper::dbIN(trim($bugIdList, ',')) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '$begin' and resolvedDate <= '$end 23:59:59'))")
+            ->andWhere("id")->in($bugIdList)
            ->fetchAll('id');
    }