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 b41c68692fb5dabbce9ab7c76f9aea805dfc45fc..51800e8357d1b1b7ae782effd1e290d678c61328 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -341,7 +341,18 @@
     <select id="getDynamicTableDataListCount" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="int">
         SELECT
-        COUNT(1)
+        <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>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
         <include refid="searchDynamicTableDataListSql"/>
     </select>
@@ -349,13 +360,25 @@
     <select id="getDynamicTableDataList" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="java.util.LinkedHashMap">
         SELECT
-        a.`uuid`,
-        <foreach collection="columnList" item="column" separator=",">
-            a.`${column}`
-        </foreach>
+        <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>
         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 590698cd996896c0264bec21d165bfb65b55651d..221e28c1f7925afa5fe7163a9d7ac40a64f4d90a 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
@@ -209,7 +209,18 @@
     <select id="getDynamicTableDataListCount" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="int">
         SELECT
-        COUNT(1)
+        <choose>
+            <when test="isDistinct != null and isDistinct">
+                COUNT(DISTINCT
+                <foreach collection="columnList" item="column" open=" " separator=",">
+                    `${column}`
+                </foreach>
+                )
+            </when>
+            <otherwise>
+                COUNT(1)
+            </otherwise>
+        </choose>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}`
         <where>
             <include refid="searchDynamicTableDataSqlNew"/>
@@ -219,15 +230,27 @@
     <select id="getDynamicTableDataList" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="java.util.LinkedHashMap">
         SELECT
-        `uuid`,
-        <foreach collection="columnList" item="column" separator=",">
-            `${column}`
-        </foreach>
+        <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>
         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 169c1016c258ad71c73caeb91c2308e2ea9a22cb..46160e5e3fbd21f803533bb0936359db2123cfd4 100644
--- a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
+++ b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
@@ -54,6 +54,9 @@ public class MatrixDataVo extends BasePageVo {
      * 查询数据时不能为空的column列表
      */
     private List<String> notNullColumnList;
+
+    private Boolean isDistinct;
+
     public String getMatrixUuid() {
         return matrixUuid;
     }
@@ -238,4 +241,12 @@ 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;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java b/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java
index 8434e3e8f1cb2ea9b93a41edec5f5fb94ff1737e..5cd9a3b424eb98679ce06887e9928e1d8d334050 100644
--- a/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java
+++ b/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java
@@ -16,22 +16,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 package neatlogic.framework.restful.audit;
 
 import neatlogic.framework.restful.dto.ApiAuditVo;
-import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-
-@Component
+@Deprecated
+//@Component
 public class ApiAuditManager {
     public final static int THREAD_COUNT = 3;
     private final static int QUEUE_SIZE = 512;
 
     private static List<BlockingQueue<ApiAuditVo>> queueList = new ArrayList<>();
 
-    @PostConstruct
+//    @PostConstruct
     public void init() {
         for (int i = 0; i < THREAD_COUNT; i++) {
             BlockingQueue<ApiAuditVo> queue = new ArrayBlockingQueue<>(QUEUE_SIZE, true);