diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index 12d17835..c93aabce 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -494,11 +494,21 @@ class Backend extends Controller if (is_array($adminIds)) { $this->model->where($this->dataLimitField, 'in', $adminIds); } - $datalist = $this->model->where($where) - ->order($order) - ->page($page, $pagesize) - ->field($this->selectpageFields) - ->select(); + //如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序 + if ($primaryvalue !== null) { + $datalist = $this->model->where($where) + ->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})") + ->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) { unset($item['password'], $item['salt']); $list[] = [