From 2b3d8d13c51bb1885607c8035dadacd95f9f7b3d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 28 Feb 2025 12:04:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E7=BC=96=E8=BE=91-=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95?=
=?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E9=80=89=E9=A1=B9=E6=8E=92=E5=BA=8F?=
=?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E4=B8=8D?=
=?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1365255123337216]表单编辑-下拉框引用自定义矩阵数据源，选项排序与自定义矩阵不一致 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1365255123337216
---
.../matrix/dao/mapper/MatrixDataMapper.xml | 25 +++++++++++++------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
index 9848e7ed4..5e70d8a19 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -361,7 +361,7 @@
SELECT
- distinct
+ MAX(a.`sort`),
a.`${column}`
@@ -375,13 +375,22 @@
FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
-
-
-
-
- ORDER BY a.`sort` DESC
-
-
+
+ GROUP BY
+
+ a.`${column}`
+
+
+
+
+
+ MAX(a.`sort`) DESC
+
+
+ a.`sort` DESC
+
+
+
LIMIT #{startNum}, #{pageSize}
--
Gitee
From 975c0d9ef484fc78025d61fbc22a42734537bd46 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 28 Feb 2025 12:07:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E7=BC=96=E8=BE=91-=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95?=
=?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E9=80=89=E9=A1=B9=E6=8E=92=E5=BA=8F?=
=?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E4=B8=8D?=
=?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1365255123337216]表单编辑-下拉框引用自定义矩阵数据源，选项排序与自定义矩阵不一致 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1365255123337216
---
.../framework/matrix/dao/mapper/MatrixDataMapper.xml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
index 5e70d8a19..a9c9999e1 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -362,17 +362,15 @@
MAX(a.`sort`),
-
- a.`${column}`
-
a.`uuid`,
-
- a.`${column}`
-
+ a.`sort`,
+
+ a.`${column}`
+
FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
--
Gitee
From 9ee8645b57751fb1b206a98e1205b328aefc8e62 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 28 Feb 2025 12:16:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E7=BC=96=E8=BE=91-=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95?=
=?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E9=80=89=E9=A1=B9=E6=8E=92=E5=BA=8F?=
=?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E4=B8=8D?=
=?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1365255123337216]表单编辑-下拉框引用自定义矩阵数据源，选项排序与自定义矩阵不一致 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1365255123337216
---
.../neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
index a9c9999e1..d48eec3e0 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -361,7 +361,7 @@
SELECT
- MAX(a.`sort`),
+ MAX(a.`sort`) AS `maxSort`,
a.`uuid`,
--
Gitee