diff --git a/src/main/java/neatlogic/framework/knowledge/dao/mapper/KnowledgeDocumentMapper.xml b/src/main/java/neatlogic/framework/knowledge/dao/mapper/KnowledgeDocumentMapper.xml
index 23d7fd729ad531c353931d9a9d59e31f1b07441d..e9cc95e86fe94533ba73a68ee2b25fde41057f68 100755
--- a/src/main/java/neatlogic/framework/knowledge/dao/mapper/KnowledgeDocumentMapper.xml
+++ b/src/main/java/neatlogic/framework/knowledge/dao/mapper/KnowledgeDocumentMapper.xml
@@ -469,19 +469,59 @@
                 #{source}
             </foreach>
         </if>
-        <if test="knowledgeDocumentTypeUuid != null and knowledgeDocumentTypeUuid != ''">
-            and kd.`knowledge_document_type_uuid` in (
-            SELECT `uuid` FROM `knowledge_document_type` WHERE
-            `lft` >= (
-            SELECT `lft` FROM `knowledge_document_type` WHERE `uuid` = #{knowledgeDocumentTypeUuid}
-            )
-            AND
-            `rht` &lt;= (
-            SELECT `rht` FROM `knowledge_document_type` WHERE `uuid` = #{knowledgeDocumentTypeUuid}
-            )
-            )
-            AND kc.`id` = (SELECT knowledge_circle_id FROM `knowledge_document_type` WHERE `uuid` =
-            #{knowledgeDocumentTypeUuid})
+        <if test="knowledgeDocumentTypeUuidList != null and knowledgeDocumentTypeUuidList.size() > 0">
+            and kd.`knowledge_document_type_uuid` in
+            <foreach collection="knowledgeDocumentTypeUuidList" item="knowledgeDocumentTypeUuid" open="(" separator="," close=")">
+                #{knowledgeDocumentTypeUuid}
+            </foreach>
+        </if>
+        <if test="knowledgeCircleId != null">
+            AND kc.`id` = #{knowledgeCircleId}
+        </if>
+        <if test="collector != null and collector != ''">
+            and kdc.`user_uuid` = #{collector}
+        </if>
+    </sql>
+
+    <sql id="searchDocumentSql" databaseId="tidb">
+        <if test="lcuList != null and lcuList.size()>0 ">
+            and kdv.`lcu` in
+            <foreach collection="lcuList" item="lcu" open="(" separator="," close=")">
+                #{lcu}
+            </foreach>
+        </if>
+        <if test="lcdStartTime != null and  lcdStartTime != ''">
+            and kdv.`lcd` >= #{lcdStartTime}
+        </if>
+        <if test="lcdEndTime != null and  lcdEndTime != ''">
+            and kdv.`lcd` &lt;= #{lcdEndTime}
+        </if>
+        <if test="tagList != null and tagList.size()>0">
+            and ktg.`name` in
+            <foreach collection="tagList" item="tag" open="(" separator="," close=")">
+                #{tag}
+            </foreach>
+        </if>
+        <if test="statusList != null and statusList.size()>0">
+            and kdv.`status` in
+            <foreach collection="statusList" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+        <if test="sourceList != null and sourceList.size()>0">
+            and kd.`source` in
+            <foreach collection="sourceList" item="source" open="(" separator="," close=")">
+                #{source}
+            </foreach>
+        </if>
+        <if test="knowledgeDocumentTypeUuidList != null and knowledgeDocumentTypeUuidList.size() > 0">
+            and kd.`knowledge_document_type_uuid` in 
+            <foreach collection="knowledgeDocumentTypeUuidList" item="knowledgeDocumentTypeUuid" open="(" separator="," close=")">
+                #{knowledgeDocumentTypeUuid}
+            </foreach>
+        </if>
+        <if test="knowledgeCircleId != null">
+            AND kc.`id` = #{knowledgeCircleId}
         </if>
         <if test="collector != null and collector != ''">
             and kdc.`user_uuid` = #{collector}
@@ -515,7 +555,7 @@
     <select id="searchKnowledgeDocumentId" parameterType="neatlogic.framework.knowledge.dto.KnowledgeDocumentVo"
             resultType="java.lang.Long">
         SELECT
-        DISTINCT kd.id
+        kd.id
         FROM `knowledge_document` kd
         JOIN `knowledge_document_version` kdv ON kd.`id` = kdv.`knowledge_document_id` AND
         kd.`knowledge_document_version_id` = kdv.`id`
@@ -536,6 +576,41 @@
         </if>
     </select>
 
+    <select id="searchKnowledgeDocumentId" databaseId="tidb" parameterType="neatlogic.framework.knowledge.dto.KnowledgeDocumentVo"
+            resultType="java.lang.Long">
+        SELECT a.id FROM `knowledge_document` a
+        JOIN `knowledge_document_version` b ON a.`id` = b.`knowledge_document_id` AND a.`knowledge_document_version_id` = b.`id`
+        JOIN (
+            SELECT
+            DISTINCT kd.id
+            FROM `knowledge_document` kd
+            JOIN `knowledge_document_version` kdv ON kd.`id` = kdv.`knowledge_document_id` AND
+            kd.`knowledge_document_version_id` = kdv.`id`
+            <if test="keywordList != null and keywordList.size() > 0">
+                JOIN fulltextindex_field_knowledge ff on ff.`target_id` = kdv.id
+                join `fulltextindex_word` fw on fw.id = ff.`word_id`
+                AND fw.word IN
+                <foreach collection="keywordList" item="k" open="("
+                         separator="," close=")">#{k}
+                </foreach>
+            </if>
+            LEFT JOIN `knowledge_circle` kc ON kd.`knowledge_circle_id` = kc.`id`
+            LEFT JOIN `knowledge_document_tag` kdt ON kdt.`knowledge_document_id` = kdv.`knowledge_document_id` AND
+            kdt.`knowledge_document_version_id` = kdv.`id`
+            LEFT JOIN `knowledge_tag` ktg ON kdt.`tag_id` = ktg.`id`
+            LEFT JOIN `knowledge_document_collect` kdc ON kd.id = kdc.`knowledge_document_id`
+            LEFT JOIN `knowledge_circle_user` kcu ON kcu.`knowledge_circle_id` = kd.`knowledge_circle_id`
+            where
+            kd.`is_delete` = 0 AND kdv.`is_delete` = 0
+            <include refid="searchDocumentSql"/>
+            <include refid="circleUserSql"/>
+        ) c ON c.id = a.`id`
+        order by b.lcd desc
+        <if test="needPage">
+            limit #{startNum}, #{pageSize}
+        </if>
+    </select>
+
     <select id="searchKnowledgeDocumentIdCount" parameterType="neatlogic.framework.knowledge.dto.KnowledgeDocumentVo"
             resultType="java.lang.Integer">
         select count(distinct kd.id)
diff --git a/src/main/java/neatlogic/framework/knowledge/dto/KnowledgeDocumentVo.java b/src/main/java/neatlogic/framework/knowledge/dto/KnowledgeDocumentVo.java
index 202467d3c4a8081af052f5dc307434851d28aaff..75fe436e80b4c12783fd0831e5ade9decf66eeb3 100755
--- a/src/main/java/neatlogic/framework/knowledge/dto/KnowledgeDocumentVo.java
+++ b/src/main/java/neatlogic/framework/knowledge/dto/KnowledgeDocumentVo.java
@@ -1,18 +1,17 @@
 package neatlogic.framework.knowledge.dto;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.common.constvalue.GroupSearch;
 import neatlogic.framework.common.dto.BaseEditorVo;
 import neatlogic.framework.dto.WorkAssignmentUnitVo;
 import neatlogic.framework.file.dto.FileVo;
-import neatlogic.framework.knowledge.dto.SyncSourceVo;
 import neatlogic.framework.knowledge.source.SyncSourceFactory;
 import neatlogic.framework.restful.annotation.EntityField;
 import neatlogic.framework.util.SnowflakeUtil;
 import neatlogic.framework.util.TimeUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -117,6 +116,8 @@ public class KnowledgeDocumentVo extends BaseEditorVo {
     private List<String> circleTeamUuidList;
     @JSONField(serialize=false)
     private List<String> circleRoleUuidList;
+    @JSONField(serialize=false)
+    private List<String> knowledgeDocumentTypeUuidList;
 
     public KnowledgeDocumentVo() {}
 
@@ -465,4 +466,12 @@ public class KnowledgeDocumentVo extends BaseEditorVo {
     public void setIsMember(Integer isMember) {
         this.isMember = isMember;
     }
+
+    public List<String> getKnowledgeDocumentTypeUuidList() {
+        return knowledgeDocumentTypeUuidList;
+    }
+
+    public void setKnowledgeDocumentTypeUuidList(List<String> knowledgeDocumentTypeUuidList) {
+        this.knowledgeDocumentTypeUuidList = knowledgeDocumentTypeUuidList;
+    }
 }