Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhaoxiang 2019-08-29 13:08:46 +08:00
commit 616de4ffdb

View File

@ -34,7 +34,9 @@ class AppGroup extends Base {
if ($type) { if ($type) {
switch ($type) { switch ($type) {
case 1: case 1:
$obj = $obj->where('hash', $keywords); if (strlen($keywords)) {
$obj = $obj->where('hash', $keywords);
}
break; break;
case 2: case 2:
$obj = $obj->whereLike('name', "%{$keywords}%"); $obj = $obj->whereLike('name', "%{$keywords}%");