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 ab4e8e00f8e768c738aa7ff3b4b1bb3887094129..9848e7ed4a67345e9cd603ff0f316246dcc974d7 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 c49b34caf88880362a943db81f1b1472a10aafa9..dcd0d78fdb657eefe9bc58657b11ef3272da41c7 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>