From b64aa95cd5f1ff66d7b69f2bfb65111cf9d7b767 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 12 Aug 2024 17:15:55 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=9B=9E=E6=BB=9A-?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9F=A9=E9=98=B5=E5=92=8C=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E7=9F=A9=E9=98=B5=E6=97=B6=EF=BC=8C=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=80=BC=E5=A4=AA=E5=A4=9A=E4=BC=9A=E5=BC=95?=
 =?UTF-8?q?=E5=8F=91=E5=BE=AA=E7=8E=AF=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1221766305775616]回滚-表单下拉框引用自定义矩阵和视图矩阵时，字段重复值太多会引发循环查询数据库 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1221766305775616
---
 .../matrix/dao/mapper/MatrixDataMapper.xml    | 33 +++----------------
 .../dao/mapper/MatrixViewDataMapper.xml       | 33 +++----------------
 .../framework/matrix/dto/MatrixDataVo.java    | 10 ------
 3 files changed, 10 insertions(+), 66 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 51800e835..b41c68692 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -341,18 +341,7 @@
     <select id="getDynamicTableDataListCount" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="int">
         SELECT
-        <choose>
-            <when test="isDistinct != null and isDistinct">
-                COUNT(DISTINCT
-                <foreach collection="columnList" item="column" open=" " separator=",">
-                    a.`${column}`
-                </foreach>
-                )
-            </when>
-            <otherwise>
-                COUNT(1)
-            </otherwise>
-        </choose>
+        COUNT(1)
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
         <include refid="searchDynamicTableDataListSql"/>
     </select>
@@ -360,25 +349,13 @@
     <select id="getDynamicTableDataList" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="java.util.LinkedHashMap">
         SELECT
-        <choose>
-            <when test="isDistinct != null and isDistinct">
-                DISTINCT
-                <foreach collection="columnList" item="column" open=" " separator=",">
-                    a.`${column}`
-                </foreach>
-            </when>
-            <otherwise>
-                a.`uuid`,
-                <foreach collection="columnList" item="column" separator=",">
-                    a.`${column}`
-                </foreach>
-            </otherwise>
-        </choose>
+        a.`uuid`,
+        <foreach collection="columnList" item="column" separator=",">
+            a.`${column}`
+        </foreach>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
         <include refid="searchDynamicTableDataListSql"/>
-        <if test="isDistinct == null or !isDistinct">
         ORDER BY a.`sort` DESC
-        </if>
         <if test="needPage == true">
             LIMIT #{startNum}, #{pageSize}
         </if>
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
index 221e28c1f..590698cd9 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
@@ -209,18 +209,7 @@
     <select id="getDynamicTableDataListCount" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="int">
         SELECT
-        <choose>
-            <when test="isDistinct != null and isDistinct">
-                COUNT(DISTINCT
-                <foreach collection="columnList" item="column" open=" " separator=",">
-                    `${column}`
-                </foreach>
-                )
-            </when>
-            <otherwise>
-                COUNT(1)
-            </otherwise>
-        </choose>
+        COUNT(1)
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}`
         <where>
             <include refid="searchDynamicTableDataSqlNew"/>
@@ -230,27 +219,15 @@
     <select id="getDynamicTableDataList" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="java.util.LinkedHashMap">
         SELECT
-        <choose>
-            <when test="isDistinct != null and isDistinct">
-                DISTINCT
-                <foreach collection="columnList" item="column" open=" " separator=",">
-                    `${column}`
-                </foreach>
-            </when>
-            <otherwise>
-                `uuid`,
-                <foreach collection="columnList" item="column" separator=",">
-                    `${column}`
-                </foreach>
-            </otherwise>
-        </choose>
+        `uuid`,
+        <foreach collection="columnList" item="column" separator=",">
+            `${column}`
+        </foreach>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}`
         <where>
             <include refid="searchDynamicTableDataSqlNew"/>
         </where>
-        <if test="isDistinct == null or !isDistinct">
         ORDER BY `id` DESC
-        </if>
         <if test="needPage == true">
             LIMIT #{startNum}, #{pageSize}
         </if>
diff --git a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
index 46160e5e3..e4ce9cc76 100644
--- a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
+++ b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
@@ -55,8 +55,6 @@ public class MatrixDataVo extends BasePageVo {
      */
     private List<String> notNullColumnList;
 
-    private Boolean isDistinct;
-
     public String getMatrixUuid() {
         return matrixUuid;
     }
@@ -241,12 +239,4 @@ public class MatrixDataVo extends BasePageVo {
     public void setKeywordColumnUniqueIdentifier(String keywordColumnUniqueIdentifier) {
         this.keywordColumnUniqueIdentifier = keywordColumnUniqueIdentifier;
     }
-
-    public Boolean getIsDistinct() {
-        return isDistinct;
-    }
-
-    public void setIsDistinct(Boolean distinct) {
-        isDistinct = distinct;
-    }
 }
-- 
Gitee