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

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

Merge pull request !260 from 傲杰笔记/fix_bug
pull/260/MERGE
Karson 2020-12-19 12:01:27 +08:00 committed by Gitee
parent c4d676aa8c 2a131ae573
commit 662d211946
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,6 +539,11 @@ 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为字符串内容时，给排序字段添加上引号
$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})");