From 8d0384ee4914b29779d97defebdede7d3795ef3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=82=B2=E6=9D=B0=E7=AC=94=E8=AE=B0?= <1095143545@qq.com>
Date: Thu, 3 Dec 2020 09:03:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=80=E5=8D=95=E4=BF=AE=E5=A4=8Dselectp?=
 =?UTF-8?q?age=20=E8=87=AA=E5=AE=9A=E4=B9=89data-primary-key=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=9E=E6=95=B0=E5=80=BC=E5=9E=8B=E5=86=85=E5=AE=B9=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4SQL=E6=8A=A5=E9=94=99BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/controller/Backend.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 4a2406461..6e0798d66 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -539,6 +539,13 @@ class Backend extends Controller
             //如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序
             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 = implode(',', $primaryvalue);
 
                 $this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})");
-- 
Gitee


From 2a131ae573e11c474bf09b5ea212e6b129846a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=82=B2=E6=9D=B0=E7=AC=94=E8=AE=B0?= <1095143545@qq.com>
Date: Sat, 19 Dec 2020 11:18:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89data-primary-key=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=97=B6=E6=8E=92=E5=BA=8F=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/controller/Backend.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 6e0798d66..e318a6a32 100644
--- a/application/common/controller/Backend.php
+++ b/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})");
-- 
Gitee