diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f188f4558..29d14efbd 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1113,6 +1113,7 @@ function get_qsos($num, $offset, $StationLocationsArray = null) { $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->where_in('station_profile.station_id', $logbooks_locations_array); $this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc"); + $this->db->order_by(''.$this->config->item('table_name').'.COL_PRIMARY_KEY', "desc"); $this->db->limit($num); $this->db->offset($offset); @@ -1179,7 +1180,7 @@ function get_last_qsos($num, $StationLocationsArray = null) { $sql = "SELECT * FROM ( select * from " . $this->config->item('table_name'). " WHERE station_id IN(". $location_list .") - order by col_time_on desc + order by col_time_on desc, col_primary_key desc limit " . $num . ") hrd JOIN station_profile ON station_profile.station_id = hrd.station_id diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index f2b3fb312..30be8f8d4 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -91,7 +91,7 @@ public function searchQsos($searchCriteria) : array { INNER JOIN station_profile ON qsos.station_id=station_profile.station_id WHERE station_profile.user_id = ? $where - ORDER BY qsos.COL_TIME_ON desc + ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc LIMIT $limit "; @@ -217,4 +217,4 @@ function get_modes() { return $modes; } -} \ No newline at end of file +}