* Merge module-bug 18.4-18.8 to Merge184.

2023-11-23 11:12:39 +08:00
parent 71d76c6c50
commit e5c33475fb
5 changed files with 15 additions and 6 deletions
@@ -197,10 +197,11 @@ class bugModel extends model
     * @param  string     $executions
     * @param  array      $excludeBugs
     * @param  object     $pager
+     * @param  string     $orderBy
     * @access public
     * @return array
     */
-    public function getActiveBugs(array|int $products, int|string $branch, string $executions, array $excludeBugs, object $pager = null): array
+    public function getActiveBugs(array|int $products, int|string $branch, string $executions, array $excludeBugs, object $pager = null, string $orderBy = 'id desc'): array
    {
        return $this->dao->select('*')->from(TABLE_BUG)
            ->where('status')->eq('active')
@@ -211,7 +212,7 @@ class bugModel extends model
            ->beginIF(!empty($executions))->andWhere('execution')->in($executions)->fi()
            ->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
            ->andWhere('deleted')->eq(0)
-            ->orderBy('id desc')
+            ->orderBy($orderBy)
            ->page($pager)
            ->fetchAll();
    }