diff --git a/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java b/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java
index 0e6c760..02517b6 100644
--- a/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java
+++ b/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java
@@ -26,27 +26,27 @@ public class DaCatalog extends BaseEntity
     private String muName;
 
     /** 父目录ID */
-    @Excel(name = "父目录ID")
+    //@Excel(name = "父目录ID")
     private Long pid;
 
     /** 祖级列表 */
-    @Excel(name = "祖级列表")
+    //@Excel(name = "祖级列表")
     private String ancestors;
 
     /** 显示顺序 */
-    @Excel(name = "显示顺序")
+   //@Excel(name = "显示顺序")
     private Long orderNum;
 
     /** 业务类型(字典) */
-    @Excel(name = "业务类型(字典)")
+    @Excel(name = "业务类型",dictType = "yw_type")
     private String ywType;
 
     /** 业务类型(字典) */
-    @Excel(name = "图片模板")
+   // @Excel(name = "图片模板")
     private String picPath;
 
     /** 菜单状态（0正常 1停用） */
-    @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用")
+   // @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 子目录 */
diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
index 6191bd3..06f0387 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
@@ -92,7 +92,7 @@ public class DaCatalogController extends BaseController
     /**
      * 导出档案目录列表
      */
-    @PreAuthorize("@ss.hasPermi('dangan:catalog:export')")
+    /*@PreAuthorize("@ss.hasPermi('dangan:catalog:export')")
     @Log(title = "档案目录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DaCatalog daCatalog)
@@ -100,6 +100,19 @@ public class DaCatalogController extends BaseController
         List<DaCatalog> list = daCatalogService.selectDaCatalogList(daCatalog, getLoginUser());
         ExcelUtil<DaCatalog> util = new ExcelUtil<DaCatalog>(DaCatalog.class);
         util.exportExcel(response, list, "档案目录数据");
+    }*/
+
+    /**
+     * 根据父级id导出档案目录列表(第一层级)
+     */
+    @PreAuthorize("@ss.hasPermi('dangan:catalog:export')")
+    @Log(title = "档案目录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DaCatalog daCatalog)
+    {
+        List<DaCatalog> list = daCatalogService.exportDaCatalogList(daCatalog, getLoginUser());
+        ExcelUtil<DaCatalog> util = new ExcelUtil<DaCatalog>(DaCatalog.class);
+        util.exportExcel(response, list, "档案目录数据");
     }
 
     /**
diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java
index f26c533..3f709db 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java
@@ -70,4 +70,8 @@ public interface DaCatalogMapper
     List<Long> selectContainIdsById(String id);
 
     Integer selectNumByPid(Long id);
+
+    List<DaCatalog> exportDaCatalogList(DaCatalog daCatalog);
+
+    List<DaCatalog> exportDaCatalogListByUserId(DaCatalog daCatalog);
 }
diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java
index b49b0d6..150c833 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java
@@ -88,4 +88,6 @@ public interface IDaCatalogService
     public List<DaCatalog> selectDaCatalogListAndcount(DaCatalog daCatalog, LoginUser user);
 
     Integer selectNumByPid(Long id);
+
+    List<DaCatalog> exportDaCatalogList( DaCatalog daCatalog, LoginUser loginUser);
 }
diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
index d9aff4e..c1232b3 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
@@ -254,6 +254,21 @@ public class DaCatalogServiceImpl implements IDaCatalogService {
         return daCatalogMapper.selectNumByPid(id);
     }
 
+    @Override
+    public List<DaCatalog> exportDaCatalogList( DaCatalog daCatalog, LoginUser loginUser) {
+        // 超管及角色为管理员显示所有目录信息
+        List<DaCatalog> catalogList;
+        if (SysUser.isAdmin(loginUser.getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+            catalogList = daCatalogMapper.exportDaCatalogList(daCatalog);
+        } else {  //根据用户权限显示目录信息
+            daCatalog.getParams().put("userId", loginUser.getUserId());
+            catalogList = daCatalogMapper.exportDaCatalogListByUserId(daCatalog);
+        }
+        return catalogList;
+
+    }
+
     /**
      * 新增档案目录
      *
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
index 1249828..9757ea6 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
@@ -126,6 +126,26 @@
 		)
 	</select>
 
+    <!--根据父id导出目录-->
+    <select id="exportDaCatalogList" resultMap="DaCatalogResult">
+        <include refid="selectDaCatalogVo"/>
+        <where>
+            <if test="id != null ">and pid = #{id}</if>
+        </where>
+        order by pid asc, order_num desc
+	</select>
+
+    <!--根据父id、userId导出目录-->
+    <select id="exportDaCatalogListByUserId" resultMap="DaCatalogResult">
+        select distinct c.*  from da_catalog c
+        left join da_user_catalog uc on c.id = uc.mu_id
+        <where>
+            uc.user_id = #{params.userId}
+            <if test="id != null ">and pid = #{id}</if>
+        </where>
+        order by pid asc, order_num desc
+	</select>
+
     <insert id="insertDaCatalog" parameterType="DaCatalog" useGeneratedKeys="true" keyProperty="id">
         insert into da_catalog
         <trim prefix="(" suffix=")" suffixOverrides=",">