diff --git a/bonus-business/src/main/java/com/bonus/business/controller/DockerLabelController.java b/bonus-business/src/main/java/com/bonus/business/controller/DockerLabelController.java
index e121626..99e0505 100644
--- a/bonus-business/src/main/java/com/bonus/business/controller/DockerLabelController.java
+++ b/bonus-business/src/main/java/com/bonus/business/controller/DockerLabelController.java
@@ -62,7 +62,7 @@ public class DockerLabelController extends BaseController {
                         Collectors.mapping(
                                 item -> {
                                     Map<String, String> m = new HashMap<>();
-                                    m.put("typeId", item.getTypeId().toString());
+                                    m.put("typeId", item.getId().toString());
                                     m.put("labelName", item.getLabelName());
                                     return m;
                                 },
diff --git a/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java b/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java
index f8b4ed4..8a7d41a 100644
--- a/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java
+++ b/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java
@@ -78,7 +78,7 @@ public class DocumentScreenController  extends BaseController {
 
 
     /**
-     * 新增文档
+     * 移动文档
      * @param vo
      * @return
      */
@@ -89,7 +89,7 @@ public class DocumentScreenController  extends BaseController {
 
 
     /**
-     * 新增文档
+     * 删除文档
      * @param vo
      * @return
      */
diff --git a/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java b/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java
index 735e380..74396a2 100644
--- a/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java
+++ b/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java
@@ -71,7 +71,7 @@ public class DocumentTreeVo {
     /**
      * 文件类型(0 文件夹  1文件)
      */
-    private Integer fileType;
+    private String fileType;
 
 
 }
diff --git a/bonus-business/src/main/java/com/bonus/business/domain/TbFolderFileVo.java b/bonus-business/src/main/java/com/bonus/business/domain/TbFolderFileVo.java
index 713f9d1..7ec385a 100644
--- a/bonus-business/src/main/java/com/bonus/business/domain/TbFolderFileVo.java
+++ b/bonus-business/src/main/java/com/bonus/business/domain/TbFolderFileVo.java
@@ -125,6 +125,7 @@ public class TbFolderFileVo {
     private String toId;
 
 
+    private List<String> idList;
 
-
+    private String keyWord;
 }
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
index b828721..1a11d96 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
@@ -98,8 +98,6 @@ public class DocumentScreenImpl implements DocumentScreenService {
             if("1".equals(type)){
                 vo.setPublicFolderId(vo.getParentId());
                 vo.setParentId("0");
-            }else {
-                vo.setParentId(vo.getParentId().split("_")[2]);
             }
             vo.setParentIds(vo.getParentIds()+vo.getParentId()+",");
             /**
@@ -150,9 +148,9 @@ public class DocumentScreenImpl implements DocumentScreenService {
             if(StringUtils.isEmpty(vo.getType())){
                 return AjaxResult.error("文件夹类型不能为空");
             }
-            if("2".equals(vo.getType())){
+           /* if("2".equals(vo.getType())){
                 vo.setId(vo.getId().split("_")[2]);
-            }
+            }*/
             vo.setUploadUser(SecurityUtils.getUserId().toString());
             vo.setCreateUser(SecurityUtils.getUserId().toString());
             String repeatType=vo.getRepeatType();
@@ -191,14 +189,14 @@ public class DocumentScreenImpl implements DocumentScreenService {
                         }
                     }
                 }
-            }
-            //删除文件
-            for (TbUserFiles tbUserFiles : delete) {
                 //删除文件
-                service.delFile(tbUserFiles.getFilePath());
+                for (TbUserFiles tbUserFiles : delete) {
+                    //删除文件
+                    service.delFile(tbUserFiles.getFilePath());
+                }
+                //删除文件
+                mapper.deleteCompanyFile(delete);
             }
-            //删除文件
-            mapper.deleteCompanyFile(delete);
             AjaxResult result=uploadFile(fileList,vo);
             //  文件上传
             if(result.isError()){
@@ -248,7 +246,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
                 return  AjaxResult.success("当前文件件不允许移动");
             }else{
                 //
-                vo.setId(vo.getId().split("_")[2]);
+                //vo.setId(vo.getId().split("_")[2]);
                 //如果是初始化节点
                 if ("0".equals(vo.getParentId())) {
                     TbFolderFileVo data=mapper.getDocumentRealData(vo);
@@ -288,8 +286,13 @@ public class DocumentScreenImpl implements DocumentScreenService {
             if("1".equals(vo.getType())){
                 return  AjaxResult.success("当前文件夹不允许删除");
             }else{
-                //
-                vo.setId(vo.getId().split("_")[2]);
+
+                //vo.setId(vo.getId().split("_")[2]);
+                if (StringUtils.isNotBlank(vo.getId())) {
+                    String[] ids = vo.getId().split(",");
+                    List<String> idList = Arrays.asList(ids);
+                    vo.setIdList(idList);
+                }
                 //如果是初始化节点
                 if ("0".equals(vo.getParentId())) {
                     TbFolderFileVo data=mapper.getDocumentRealData(vo);
@@ -324,7 +327,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
                 return  AjaxResult.success("当前文件夹没权限共享");
             }else{
                 //
-                vo.setId(vo.getId().split("_")[2]);
+               /* vo.setId(vo.getId().split("_")[2]);*/
                 TbDocumentFolder documentFolder=new TbDocumentFolder();
                 String[] ids=vo.getUserIds().split(",");
                 //共享文件夹创建
@@ -405,7 +408,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
                 return  AjaxResult.success("当前文件夹不允许添加副本");
             }else{
 
-                vo.setId(vo.getId().split("_")[2]);
+                //vo.setId(vo.getId().split("_")[2]);
                 //查询当前节点下全部信息
                 //重新添加头部信息
                 getTreeList(vo);
@@ -468,6 +471,8 @@ public class DocumentScreenImpl implements DocumentScreenService {
         List<TbFolderFileVo>  treeList=mapper.getList(idList);
         for (TbFolderFileVo vo2 : treeList) {
             String uuid=StringUtils.randomUUID();
+            vo2.setNewParentId(vo.getNewParentId());
+            vo2.setParentIds(vo.getParentIds());
             vo2.setNewId(uuid);
             List<TbFolderFileVo> childer= getChilderList(vo2,list);
             vo2.setChild(childer);
@@ -619,7 +624,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
         }else{
             documentFolder.setParentId(files.getParentId());
         }
-        documentFolder.setParentIds(documentFolder.getParentIds()+documentFolder.getParentId()+",");
+        documentFolder.setParentIds(files.getParentIds()+documentFolder.getParentId()+",");
         //
         String[] ids=files.getLabelIds().split(",");
         String[] name= files.getLabels().split(",");
diff --git a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
index 34493e5..1cc4894 100644
--- a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
+++ b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
@@ -26,14 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete  from  tb_public_real_user where  public_folder_id=#{parentId} and user_id=#{userId} and user_folder_id=#{id}
     </delete>
     <delete id="deleteDocumentParentId">
-        update     tb_user_document_folder set from del_flag=1 where id=#{id}
+        delete  from      tb_user_document_folder  where id in
+        <foreach collection="idList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </delete>
     <insert id="addDocumentLabels">
-        insert into tb_document_files_label( file_id, label_id, label_name)values (
+        insert into tb_document_files_label( file_id, lable_id, lable_name)values
             <foreach collection="list" item="item" separator=",">
-                  #{item.fileId},#{item.labelId},#{item.labelName}
+                 (#{item.fileId},#{item.labelId},#{item.labelName})
             </foreach>
-        )
+
     </insert>
     <insert id="addDocumentRealUser">
             replace into tb_public_real_user(
@@ -42,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <!--添加文件-->
     <update id="updateDocumentParentId">
-        update tb_user_document_folder set parent_id=#{parentId},parent_ids=#{parentIds}
+        update tb_user_document_folder set parent_id=#{newParentId},parent_ids=#{parentIds}
         where id=#{id}
     </update>
     <update id="updateLookNum">
@@ -80,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         concat(pru.public_folder_id,"_",pru.user_id,"_",folder.id) exeId
         from tb_user_document_folder  folder
         left join tb_public_real_user pru on folder.id=pru.user_folder_id
-        where folder.file_type=0
+        where folder.del_flag ='0'
     </select>
     <!--文件夹名称是否存在-->
     <select id="getDocumentByNum" resultType="java.lang.Integer">
@@ -129,16 +132,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join tb_user_document_folder  tudf on tpru.user_folder_id=tudf.id
             left join sys_user su on su.user_id=tudf.create_user
             where tudf.del_flag=0   and tpru.public_folder_id=#{parentId}
+            <if test='keyWord!=null'>
+                and INSTR(tudf.folder_name,#{keyWord}) > 0
+            </if>
         </if>
         <if test='type=="2" or type==2 '>
             SELECT tudf.id, tudf.folder_name name,tudf.parent_id parentId,tudf.parent_ids,2 type ,tudf.down_times downNum,
-            tudf.labels labName,
             tudf.file_type fileType,tudf.file_suffix fileSuffix,
-            tudf.see_times readNum,	tudf.create_user,tudf.create_time createTime,tudf.update_time updateTime,su.user_name createUser
+            tudf.see_times readNum,	tudf.create_user,tudf.create_time createTime,tudf.update_time updateTime,su.user_name createUser,
+            GROUP_CONCAT(tdfl.lable_name SEPARATOR ',') AS labName
             FROM  tb_user_document_folder  tudf
             left join tb_public_real_user  tpru on tpru.user_folder_id=tudf.id
             left join sys_user su on su.user_id=tudf.create_user
+            LEFT JOIN tb_document_files_label tdfl on tdfl.file_id = tudf.id
             where tudf.del_flag=0   and tudf.parent_id=#{parentId}
+            <if test='keyWord!=null'>
+                and INSTR(tudf.folder_name,#{keyWord}) > 0
+            </if>
+            GROUP BY  tudf.id
         </if>
     </select>
     <select id="getDocumentRealData" resultType="com.bonus.business.domain.TbFolderFileVo">
@@ -163,8 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="getList" resultType="com.bonus.business.domain.TbFolderFileVo">
-        select  id,  level, folder_name, parent_id,  file_type, remark, parent_ids, file_path, file_id,
-                #{newId} newParentId,
+        select  id,  level, folder_name as name, parent_id,  file_type, remark, parent_ids, file_path, file_id,
             down_times,  see_times,  file_suffix,   labels, create_user,   create_time,
             update_user,  update_time, del_flag
             from tb_user_document_folder
@@ -176,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <!--查询子数据-->
     <select id="getChilderList" resultType="com.bonus.business.domain.TbFolderFileVo">
-        select  id,  level, folder_name, parent_id,  file_type, remark, parent_ids, file_path, file_id,
+        select  id,  level, folder_name as name, parent_id,  file_type, remark, parent_ids, file_path, file_id,
                 #{newId} newParentId,
                 down_times,  see_times,  file_suffix,   labels, create_user,   create_time,
                 update_user,  update_time, del_flag