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

简单修复selectpage 自定义data-primary-key为非数值型内容时，自定义排序导致SQL报错BUG

pull/260/head
傲杰笔记 2020-12-03 09:03:39 +08:00
parent eca3ae7086
commit 8d0384ee49
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,6 +539,13 @@ class Backend extends Controller
//如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序 //如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序
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为字符串内容时，给排序字段添加上引号
$pk = $this->model->getPk();
if ($primarykey != $pk) {
$primaryvalue= array_map(function ($value) {
return '\'' . $value . '\'';
}, $primaryvalue);
}
$primaryvalue = implode(',', $primaryvalue); $primaryvalue = implode(',', $primaryvalue);
$this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})"); $this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})");