Browse Source

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

傲杰笔记 5 years ago
parent
commit
2a131ae573
1 changed files with 4 additions and 6 deletions
  1. 4 6
      application/common/controller/Backend.php

+ 4 - 6
application/common/controller/Backend.php

@@ -540,12 +540,10 @@ class Backend extends Controller
             if ($primaryvalue !== null && preg_match("/^[a-z0-9_\-]+$/i", $primarykey)) {
                 $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=   array_map(function ($value) {
+                    return '\'' . $value . '\'';
+                }, $primaryvalue);
+
                 $primaryvalue = implode(',', $primaryvalue);
 
                 $this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})");