likang

catch/tag_history/controller/TagHistory.php

@@ -38,7 +38,8 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
 
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
-        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', [4, 5])->find();
+        $ccccRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', 5)->find();
 
 
 
@@ -101,21 +102,24 @@ class TagHistory extends CatchController
             $wheres[] = ['addTime', '=', $value['addTime']];
             $da = $this->tagHistoryModel->where($wheres)->find();
             $list[$key]['rssi'] = $da['rssi'];
-            if ($key == 0) {
-                $list[$key]['move'] = 0;
-                $list[$key]['temperature'] = 38.5;
-                $list[$key]['step'] = 1502;
-            } else {
-                $list[$key]['move'] = 1;
-                $list[$key]['temperature'] = 39;
-                $list[$key]['step'] = 2100;
-                $das = Db::name('config')->where('key', 'upload')->find();
-                if (empty($das['value'])) {
-                    $das['value'] = 2100;
+            if ($ccccRole) {
+                if ($key == 0) {
+                    $list[$key]['move'] = 0;
+                    $list[$key]['temperature'] = 38.5;
+                    $list[$key]['step'] = 1502;
+                } else {
+                    $list[$key]['move'] = 1;
+                    $list[$key]['temperature'] = 39;
+                    $list[$key]['step'] = 2100;
+                    $das = Db::name('config')->where('key', 'upload')->find();
+                    if (empty($das['value'])) {
+                        $das['value'] = 2100;
+                    }
+                    $list[$key]['step'] = $das['value'];
+                    Db::name('config')->where('key', 'upload')->update(['value' => $das['value'] + 1]);
                 }
-                $list[$key]['step'] = $das['value'];
-                Db::name('config')->where('key', 'upload')->update(['value' => $das['value'] + 1]);
             }
+
             $list[$key]['addTime'] = date('Y-m-d H:i:s', $value['addTime']);
             $list[$key]['lable'] = str_replace('30b5', '0000', $value['lable']);
             $list[$key]['time'] = date('Y-m-d H:i:s', $da['time']);
@@ -173,7 +177,7 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
         $where = [];
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
-        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', [4, 5])->find();
 
         if ($bool) {
             $where[] = ['mac', 'in', '30B5F1013899'];
@@ -195,7 +199,7 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
         $where = [];
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
-        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', [4, 5])->find();
 
         if ($bool) {
             $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];