likang

catch/tag_history/controller/TagHistory.php

@@ -64,7 +64,7 @@ class TagHistory extends CatchController
             $where[] = ['mac', 'in',  implode(",", $mac)];
         }
         if (!empty($tage)) {
-            $where[] = ['lable', 'in',  implode(",", $tage)];
+            $where[] = ['lable', 'in',  implode(",", $tage)];   
         }
         if ($endtime == 1) {
             //生成报告
@@ -113,7 +113,8 @@ class TagHistory extends CatchController
             $where[] = ['lable', 'in', "000080000001,000080000002,0000F6000003,0000F6000004,0000F6000005"];
         }
 
-        $list = $this->tagHistoryModel->group('mac,lable')->where('addTime','>',strtotime(date('Y-d-m')))->where($where)
+
+        $list = $this->tagHistoryModel->group('mac,lable')->where('addTime','>',strtotime("-4 hour"))->where($where)
             ->field('mac,lable')->select()->toArray();
        
         foreach ($list as $key => $value) {