mirror of https://gitee.com/karson/fastadmin.git
parent
13da01a48c
commit
69d155b1d0
|
|
@ -494,11 +494,21 @@ class Backend extends Controller
|
||||||
if (is_array($adminIds)) {
|
if (is_array($adminIds)) {
|
||||||
$this->model->where($this->dataLimitField, 'in', $adminIds);
|
$this->model->where($this->dataLimitField, 'in', $adminIds);
|
||||||
}
|
}
|
||||||
$datalist = $this->model->where($where)
|
//如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序
|
||||||
->order($order)
|
if ($primaryvalue !== null) {
|
||||||
->page($page, $pagesize)
|
$datalist = $this->model->where($where)
|
||||||
->field($this->selectpageFields)
|
->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})")
|
||||||
->select();
|
->page($page, $pagesize)
|
||||||
|
->field($this->selectpageFields)
|
||||||
|
->select();
|
||||||
|
} else {
|
||||||
|
$datalist = $this->model->where($where)
|
||||||
|
->order($order)
|
||||||
|
->page($page, $pagesize)
|
||||||
|
->field($this->selectpageFields)
|
||||||
|
->select();
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($datalist as $index => $item) {
|
foreach ($datalist as $index => $item) {
|
||||||
unset($item['password'], $item['salt']);
|
unset($item['password'], $item['salt']);
|
||||||
$list[] = [
|
$list[] = [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue