8000 Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin · laraveladmin-cn/laraveladmin@231f095 · GitHub
[go: up one dir, main page]

Skip to content

Commit 231f095

Browse files
author
张世平
committed
2 parents 1d530d1 + 0173cfa commit 231f095

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

app/Models/Traits/BaseModel.php

+4
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,10 @@ protected function jointWhere(&$query,$key,$exp,$val,$condition='and'){
342342
$exps[] = 'whereRaw';
343343
$where = Str::camel(implode('_',$exps));
344344
$query->$where("FIND_IN_SET( ? ,`{$key}`)",[$val]);
345+
}elseif($exp=='!&'){
346+
$exps[] = 'whereRaw';
347+
$where = Str::camel(implode('_',$exps));
348+
$query->$where("(`{$key}`& ?)=0",[$val]);
345349
}else{
346350
$exps[] = 'where';
347351
$where = Str::camel(implode('_',$exps));

0 commit comments

Comments
 (0)
0