Fixes Bug, when dupes isn't set
这个提交包含在:
父节点
e0d3eed653
当前提交
c602dab260
共有 1 个文件被更改,包括 1 次插入 和 3 次删除
|
|
@ -7,7 +7,7 @@ class Logbookadvanced_model extends CI_Model {
|
||||||
$conditions = [];
|
$conditions = [];
|
||||||
$binding = [$searchCriteria['user_id']];
|
$binding = [$searchCriteria['user_id']];
|
||||||
|
|
||||||
if ($searchCriteria['dupes'] !== '') {
|
if ((isset($searchCriteria['dupes'])) && ($searchCriteria['dupes'] !== '')) {
|
||||||
$id_sql="select group_concat(x.qsoids separator ',') as QSO_IDs from (
|
$id_sql="select group_concat(x.qsoids separator ',') as QSO_IDs from (
|
||||||
select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from " . $this->config->item('table_name') . "
|
select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from " . $this->config->item('table_name') . "
|
||||||
join station_profile on " . $this->config->item('table_name') . ".station_id = station_profile.station_id where station_profile.user_id=?
|
join station_profile on " . $this->config->item('table_name') . ".station_id = station_profile.station_id where station_profile.user_id=?
|
||||||
|
|
@ -225,11 +225,9 @@ class Logbookadvanced_model extends CI_Model {
|
||||||
ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc
|
ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc
|
||||||
LIMIT $limit
|
LIMIT $limit
|
||||||
";
|
";
|
||||||
|
|
||||||
$data = $this->db->query($sql, $binding);
|
$data = $this->db->query($sql, $binding);
|
||||||
|
|
||||||
$results = $data->result('array');
|
$results = $data->result('array');
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用