likang

catch/tag_history/controller/TagHistory.php

@@ -116,11 +116,15 @@ class TagHistory extends CatchController
             ->field('mac,lable')->select()->toArray();
 
         foreach ($list as $key => $value) {
-             
+            $towwhere=
+            [
+                ['mac', '=', $value['mac']],
+                ['lable', '=', $value['lable']]
+            ];
             $value['addTime'] = $this->tagHistoryModel->
-                where($where)->where($onewhere)->max('addTime');
-            $value['ave_rssi']= $this->tagHistoryModel->where($where)->where($onewhere)->avg('rssi');
-            $value['num']=$this->tagHistoryModel->where($where)->where($onewhere)->count();
+                where($where)->where($towwhere)->max('addTime');
+            $value['ave_rssi']= $this->tagHistoryModel->where($where)->where($towwhere)->avg('rssi');
+            $value['num']=$this->tagHistoryModel->where($where)->where($towwhere)->count();
             
 
             $wheres = [];