|
|
@@ -400,6 +400,7 @@ class Color extends Start_Controller {
|
|
|
$state = $this->input->get('state',true);
|
|
|
$timetk = $this->input->get('timetk',true);
|
|
|
$timetj = $this->input->get('timetj',true);
|
|
|
+ $sid = $this->input->get('sid',true);
|
|
|
$timetk = strtotime($timetk);
|
|
|
$timetj = strtotime($timetj);
|
|
|
$where = "1=1";
|
|
|
@@ -430,6 +431,10 @@ class Color extends Start_Controller {
|
|
|
if($timetk && $timetj)
|
|
|
{
|
|
|
$where .= " and time > '$timetk' and time < '$timetj'";
|
|
|
+ }
|
|
|
+ if($sid)
|
|
|
+ {
|
|
|
+ $where .= " and id in (".trim($sid,',').") ";
|
|
|
}
|
|
|
//数据排序
|
|
|
$order_str = "id desc";
|
