likang 2 years ago
parent
commit
57b10e85b2
1 changed files with 6 additions and 3 deletions
  1. 6 3
      catch/tag_history/controller/TagHistory.php

+ 6 - 3
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', 'in', [4, 5])->find();
+        $wheress[] = ['role_id', 'in', [4, 5]];
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where($wheress)->find();
         $ccccRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', 5)->find();
 
 
@@ -177,7 +178,8 @@ 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', 'in', [4, 5])->find();
+        $wheress[] = ['role_id', 'in', [4, 5]];
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', $wheress)->find();
 
         if ($bool) {
             $where[] = ['mac', 'in', '30B5F1013899'];
@@ -199,7 +201,8 @@ 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', 'in', [4, 5])->find();
+        $wheress[] = ['role_id', 'in', [4, 5]];
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where($wheress)->find();
 
         if ($bool) {
             $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];