|
|
@@ -130,7 +130,7 @@ class Lamp_model extends Base_model {
|
|
|
// $this->db->join('solar_info_log as SI', 'L.id = SI.lampid AND SI.lampid=T.lampid AND SI.updatetime = T.time', 'left');
|
|
|
// $this->db->join('electric_info_log as EI', 'L.id = EI.lampid AND EI.lampid=T.lampid AND EI.updatetime = T.time', 'left');
|
|
|
// $this->db->join('system_info_log as SIL', 'L.id = SIL.lampid AND SIL.lampid=T.lampid AND SIL.updatetime = T.time', 'left');
|
|
|
- $this->db->order_by("L.number ASC,N.networkname ASC");
|
|
|
+ $this->db->order_by("L.number ASC");
|
|
|
}else{
|
|
|
$this->db->order_by("L.number ASC");
|
|
|
}
|
