hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!225 多选字段存储和编辑时按选择顺序存储及显示 

Merge pull request !225 from HID丨emotion/adv_multi_order
pull/244/head
Karson 2020-09-29 09:53:36 +08:00 committed by Gitee
parent 750f5d7887 c3eae7b1aa
commit 32f256f3fa
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/common/controller/Backend.php
View File

@ -533,11 +533,27 @@ 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);
} }
$fields = is_array($this->selectpageFields) ? $this->selectpageFields : ($this->selectpageFields && $this->selectpageFields != '*' ? explode(',', $this->selectpageFields) : []); $fields = is_array($this->selectpageFields) ? $this->selectpageFields : ($this->selectpageFields && $this->selectpageFields != '*' ? explode(',', $this->selectpageFields) : []);
$datalist = $this->model->where($where)
->order($order) //如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序
->page($page, $pagesize) if ($primaryvalue !== null) {
->select(); $primaryvalue = array_unique(is_array($primaryvalue) ? $primaryvalue : explode(',', $primaryvalue));
$primaryvalue = implode(',', array_map([$this->model->getConnection(), 'quote'], $primaryvalue));
$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) { foreach ($datalist as $index => $item) {
unset($item['password'], $item['salt']); unset($item['password'], $item['salt']);
if ($this->selectpageFields == '*') { if ($this->selectpageFields == '*') {