improved the report list sorting. Closes #93

liuch · Jul 21, 2023 · dd0e87d · dd0e87d
1 parent 8165b2d
commit dd0e87d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/Database/Mariadb/ReportMapper.php b/classes/Database/Mariadb/ReportMapper.php
@@ -291,7 +291,7 @@ public function list(array &$filter, array &$order, array &$limit): array
         $limit_str = $this->sqlLimit($limit);
         try {
             $st = $db->prepare(
-                'SELECT `org`, `begin_time`, `end_time`, `fqdn`, external_id, `seen`, SUM(`rcount`) AS `rcount`,'
+                'SELECT `org`, `begin_time`, `end_time`, `fqdn`, `external_id`, `seen`, SUM(`rcount`) AS `rcount`,'
                 . ' MIN(`dkim_align`) AS `dkim_align`, MIN(`spf_align`) AS `spf_align`,'
                 . ' MIN(`disposition`) AS `disposition` FROM `' . $this->connector->tablePrefix('rptrecords')
                 . '` AS `rr` RIGHT JOIN (SELECT `rp`.`id`, `org`, `begin_time`, `end_time`, `external_id`,'
@@ -557,7 +557,7 @@ private function sqlOrderList(array &$order): string
     {
 
         $dir = $order['direction'] === 'ascent' ? 'ASC' : 'DESC';
-        return " ORDER BY `{$order['field']}` {$dir}";
+        return " ORDER BY `{$order['field']}` {$dir}, `rp`.`id` {$dir}";
     }
 
     /**