From fc1fddc9fdd0c714e634c0ad439ff8833bf9f8cd Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 26 Nov 2024 12:25:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=8E=BB=E9=87=8D=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1297667194322944]视图矩阵去重逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1297667194322944
---
 .../neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml  | 2 +-
 .../framework/matrix/dao/mapper/MatrixViewDataMapper.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 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 ab4e8e00f..9848e7ed4 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -344,7 +344,7 @@
             <choose>
                 <when test="distinct">
                     COUNT(distinct
-                    <foreach collection="columnList" item="column" separator=",">
+                    <foreach collection="notNullColumnList" item="column" separator=",">
                         a.`${column}`
                     </foreach>)
                 </when>
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 c49b34caf..dcd0d78fd 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
@@ -213,7 +213,7 @@
         <choose>
             <when test="distinct">
                 COUNT(distinct
-                <foreach collection="columnList" item="column" separator=",">
+                <foreach collection="notNullColumnList" item="column" separator=",">
                     `${column}`
                 </foreach>)
             </when>
-- 
Gitee