likang

catch/tag_history/controller/TagHistory.php

@@ -48,6 +48,7 @@ class TagHistory extends CatchController
         //cs店
         $cs_store = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 8)->find();
 
+
         if (!empty($time)) {
             $where[] = ['addTime', '>=', $time];
         } else {
@@ -103,8 +104,8 @@ class TagHistory extends CatchController
             $where[] = ['mac', 'in', '30B5F10138BA'];
             $where[] = ['lable', 'in', "87011111CFC1,8702222CFC1,8702222CFC1"];
         } else if ($cs_store) {
-            $where[] = ['mac', 'in', '30B5F1013238'];
-            $where[] = ['lable', 'in', "000080000001,000080000002"];
+            $where[] = ['mac', 'in', '30B5F1013238,30B5F10138EB'];
+            $where[] = ['lable', 'in', "000080000001,000080000002,0000F6000003,0000F6000004"];
         }
 
         $list = $this->tagHistoryModel->group('mac,lable')->where($where)
@@ -209,7 +210,7 @@ class TagHistory extends CatchController
         } elseif ($manage) {
             $mac = '30B5F10138BA';
         } elseif ($cs_store) {
-            $mac = '30B5F1013238';
+            $mac = '30B5F1013238,30B5F10138EB';
         }
         $list = explode(',', $mac);
         return CatchResponse::success($list);
@@ -250,7 +251,7 @@ class TagHistory extends CatchController
         } else if ($manage) {
             $lable = "87011111CFC1,8702222CFC1,8702222CFC1";
         } else if ($cs_store) {
-            $lable = "000080000001,000080000002";
+            $lable = "000080000001,000080000002,0000F6000003,0000F6000004";
         }
         $list = explode(',', $lable);