likang

catch/tag_history/controller/TagHistory.php

@@ -195,23 +195,23 @@ class TagHistory extends CatchController
         $nonghu = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 7)->find();
         //cs店
         $cs_store = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 8)->find();
-
+        $mac = null;
         if ($bool) {
-            $where[] = ['mac', 'in', '30B5F1013899'];
+            $mac = '30B5F1013899';
         } else if ($shifouRole) {
-            $where[] = ['mac', 'in', '30B5F10138EB'];
+            $mac = '30B5F10138EB';
         } elseif ($ccccRole) {
-            $where[] = ['mac', 'in', '30B5F10138ED,30B5F1012F7A'];
+            $mac = '30B5F10138ED,30B5F1012F7A';
         } elseif ($nonghu) {
-            $where[] = ['mac', 'in', '30B5F10138ED'];
+            $mac = '30B5F10138ED';
         } elseif ($six) {
-            $where[] = ['mac', 'in', '30B5F1013801'];
+            $mac = '30B5F1013801';
         } elseif ($manage) {
-            $where[] = ['mac', 'in', '30B5F10138BA'];
+            $mac = '30B5F10138BA';
         } elseif ($cs_store) {
-            $where[] = ['mac', 'in', '30B5F1013238'];
+            $mac = '30B5F1013238';
         }
-        $list = $this->tagHistoryModel->group('mac')->where($where)->column('mac');
+        $list = explode(',', $mac);
         return CatchResponse::success($list);
     }
     /**
@@ -235,25 +235,25 @@ class TagHistory extends CatchController
         $nonghu = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 7)->find();
         //测试cs店
         $cs_store = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 8)->find();
-
+        $lable = null;
 
         if ($bool) {
-            $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
+            $lable =  "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306";
         } elseif ($shifouRole) {
-            $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
+            $lable = "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008";
         } elseif ($ccccRole) {
-            $where[] = ['lable', 'in', "000000880002,000000880003,000000880004"];
+            $lable =  "000000880002,000000880003,000000880004";
         } elseif ($nonghu) {
-            $where[] = ['lable', 'in', "000000880002,000000880003"];
+            $lable =  "000000880002,000000880003";
         } elseif ($six) {
-            $where[] = ['lable', 'in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
+            $lable = "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355";
         } else if ($manage) {
-            $where[] = ['lable', 'in', "87011111CFC1,8702222CFC1,8702222CFC1"];
+            $lable = "87011111CFC1,8702222CFC1,8702222CFC1";
         } else if ($cs_store) {
-            $where[] = ['lable', 'in', "000080000001,000080000002"];
+            $lable = "000080000001,000080000002";
         }
+        $list = explode(',', $lable);
 
-        $list = $this->tagHistoryModel->group('lable')->where($where)->column('lable');
         return CatchResponse::success($list);
     }
     /**