Merge branch bug-66417 of zentao/zentaopms (#12136)

2025-10-31 16:12:13 +08:00
parent 75e817a169 d8d9d6fb6a
commit 28e8587518
1 changed files with 1 additions and 1 deletions
@@ -2066,7 +2066,7 @@ class executionModel extends model
            ->where('t1.deleted')->eq(0)
            ->beginIF($filterStatus)->andWhere('t1.status')->notin('closed,cancel')->fi()
            ->andWhere('t1.execution')->in($executionIdList)
-            ->orderBy('t1.order_asc, t1.id_desc')
+            ->orderBy('t1.order_asc, t1.id_asc')
            ->fetchGroup('execution', 'id');

        $begin      = $end = helper::today();