Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin

张世平 · 张世平 · commit 231f0958b5a6 · 2024-10-14T16:18:19.000+08:00
diff --git a/app/Models/Traits/BaseModel.php b/app/Models/Traits/BaseModel.php
@@ -342,6 +342,10 @@ protected function jointWhere(&$query,$key,$exp,$val,$condition='and'){
             $exps[] = 'whereRaw';
             $where = Str::camel(implode('_',$exps));
             $query->$where("FIND_IN_SET( ? ,`{$key}`)",[$val]);
+        }elseif($exp=='!&'){
+            $exps[] = 'whereRaw';
+            $where = Str::camel(implode('_',$exps));
+            $query->$where("(`{$key}`& ?)=0",[$val]);
         }else{
             $exps[] = 'where';
             $where = Str::camel(implode('_',$exps));
