1

core/CoreApp/controllers/Color.php

@@ -566,6 +566,7 @@ class Color extends Start_Controller {
 			$timetk = $this->input->get('timetk',true);
 			$timetj = $this->input->get('timetj',true);
 			$color = $this->input->get('color',true);
+			$xztime = $this->input->get('xztime',true);
 			$timetk = strtotime($timetk);
 			$timetj = strtotime($timetj);
 			$sid = $this->input->get('sid',true);
@@ -599,7 +600,12 @@ class Color extends Start_Controller {
             }
 			if($timetk && $timetj)
             {
-                $where  .= " and time > '$timetk' and time < '$timetj'";
+				if($xztime == 2){
+					$where  .= " and time > '$timetk' and time < '$timetj'";
+				}else{
+					$where  .= " and edittime > '$timetk' and edittime < '$timetj'";
+				}
+               
             }
 			if($sid)
             {