|
|
@@ -46,12 +46,9 @@ class ConfigService extends BaseService
|
|
|
}
|
|
|
|
|
|
if (isset($search['group_id']) && !empty($search['group_id'])) {
|
|
|
- if (is_array($search['group_id'])) {
|
|
|
- $where[] = ['group_id', 'in', $search['group_id']];
|
|
|
- } else {
|
|
|
+ if (!is_array($search['group_id'])) {
|
|
|
$where[] = ['group_id', '=', $search['group_id']];
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if (isset($search['id']) && !empty($search['id'])) {
|
|
|
@@ -60,6 +57,7 @@ class ConfigService extends BaseService
|
|
|
return $where;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* @description: 查询单条数据
|
|
|
* @param array $search
|
|
|
@@ -88,7 +86,11 @@ class ConfigService extends BaseService
|
|
|
public static function paginate(array $search = [])
|
|
|
{
|
|
|
$limit = isset($search['limit']) ? $search['limit'] : 15;
|
|
|
- $paginator = self::model()::where(self::getWhere($search))->paginate($limit);
|
|
|
+ $query = self::model()::where(self::getWhere($search));
|
|
|
+ if (isset($search['in_group_id']) && is_array($search['in_group_id'])) {
|
|
|
+ $query = $query->whereIn('group_id', $search['in_group_id']);
|
|
|
+ }
|
|
|
+ $paginator = $query->paginate($limit);
|
|
|
return ['total' => $paginator->total(), 'data' => $paginator->items()];
|
|
|
}
|
|
|
|