likang

catch/tag_history/controller/TagHistory.php

@@ -96,8 +96,8 @@ class TagHistory extends CatchController
             $where[] = ['mac', 'in', '30B5F1013899'];
             $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
         } elseif ($shifouRole) {
-            $where[] = ['mac', 'in', '30B5F10138EB'];
-            $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008,0000F6000003,0000F6000004,0000F6000005"];
+            $where[] = ['mac', 'in', '30B5F10138EB,30B5F101321C'];
+            $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008,0000F6000003,0000F6000004,0000F6000005,00000098C14F,00000098C150,00000098C159"];
         } elseif ($ccccRole) {
             $where[] = ['mac', 'in', '30B5F10138ED,30B5F1012F7A'];
             $where[] = ['lable', 'in', "000000880002,000000880003"];
@@ -252,7 +252,7 @@ class TagHistory extends CatchController
         if ($bool) {
             $mac = '30B5F1013899';
         } else if ($shifouRole) {
-            $mac = '30B5F10138EB';
+            $mac = '30B5F10138EB,30B5F101321C';
         } elseif ($ccccRole) {
             $mac = '30B5F10138ED,30B5F1012F7A';
         } elseif ($nonghu) {
@@ -296,7 +296,7 @@ class TagHistory extends CatchController
         if ($bool) {
             $lable =  "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306";
         } elseif ($shifouRole) {
-            $lable = "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008,0000F6000003,0000F6000004,0000F6000005";
+            $lable = "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008,0000F6000003,0000F6000004,0000F6000005,00000098C14F,00000098C150,00000098C159";
         } elseif ($ccccRole) {
             $lable =  "000000880002,000000880003";
         } elseif ($nonghu) {