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

修复自定义data-primary-key为字符串内容时排序报错BUG

pull/260/head
傲杰笔记 2020-12-19 11:18:07 +08:00
parent 8d0384ee49
commit 2a131ae573
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,12 +540,10 @@ class Backend extends Controller
if ($primaryvalue !== null && preg_match("/^[a-z0-9_\-]+$/i", $primarykey)) { if ($primaryvalue !== null && preg_match("/^[a-z0-9_\-]+$/i", $primarykey)) {
$primaryvalue = array_unique(is_array($primaryvalue) ? $primaryvalue : explode(',', $primaryvalue)); $primaryvalue = array_unique(is_array($primaryvalue) ? $primaryvalue : explode(',', $primaryvalue));
//修复自定义data-primary-key为字符串内容时，给排序字段添加上引号 //修复自定义data-primary-key为字符串内容时，给排序字段添加上引号
$pk = $this->model->getPk(); $primaryvalue= array_map(function ($value) {
if ($primarykey != $pk) { return '\'' . $value . '\'';
$primaryvalue= array_map(function ($value) { }, $primaryvalue);
return '\'' . $value . '\'';
}, $primaryvalue);
}
$primaryvalue = implode(',', $primaryvalue); $primaryvalue = implode(',', $primaryvalue);
$this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})"); $this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})");