diff --git a/hchyun-ui/src/api/system/file.js b/hchyun-ui/src/api/system/file.js
index 3e34978..95e5715 100644
--- a/hchyun-ui/src/api/system/file.js
+++ b/hchyun-ui/src/api/system/file.js
@@ -64,10 +64,11 @@ export function getRoleAll(){
   })
 }
 
-export function downloadFile(fileId){
+// 获取文件夹列表
+export function getFolder(){
   return request({
-    url:'/system/file/download/'+fileId,
-    method:'get'
+    url:'/system/file/folder',
+    method:'get',
   })
 }
 
diff --git a/hchyun-ui/src/views/system/file/index.vue b/hchyun-ui/src/views/system/file/index.vue
index 08fe9e3..cb7b8eb 100644
--- a/hchyun-ui/src/views/system/file/index.vue
+++ b/hchyun-ui/src/views/system/file/index.vue
@@ -173,6 +173,16 @@
 
     <el-dialog :title="fileForm.title" :visible.sync="fileForm.open" width="500px" append-to-body>
       <el-form ref="uploadFrom" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="文件夹">
+          <el-select v-model="form.pId" multiple placeholder="请选择">
+            <el-option
+              v-for="item in folderOptions"
+              :key="item.fileId"
+              :label="item.fileName"
+              :value="item.fileId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="角色">
           <el-select v-model="form.roleIds" multiple placeholder="请选择">
             <el-option
@@ -216,7 +226,7 @@
 </template>
 
 <script>
-import {listFile, getFile, delFile, addFile, updateFile, exportFile, getRoleAll} from "@/api/system/file";
+import {listFile, getFile, delFile, addFile, updateFile, exportFile, getRoleAll, getFolder} from "@/api/system/file";
 import {downloadFile} from '@/api/system/download'
 import ImageUpload from '@/components/ImageUpload';
 import FileUpload from '@/components/FileUpload';
@@ -255,6 +265,7 @@ export default {
       // 弹出层标题
       title: "",
       isAdd: true,
+      folderOptions: [],
       // 文件类型(文件夹:folder,文件:file)字典
       fileTypeOptions: [],
       // 是否公开字典
@@ -289,6 +300,9 @@ export default {
     getRoleAll().then(res => {
       this.roleOptions = res.data
     })
+    getFolder().then(res =>{
+      this.folderOptions = res.data
+    })
   },
   methods: {
     /** 查询文件信息列表 */
@@ -336,14 +350,14 @@ export default {
       this.reset();
     },
     // 下载按钮
-    handleDownload(row){
-      this.$confirm("是否确认下载"+row.fileName+"?","警告",{
+    handleDownload(row) {
+      this.$confirm("是否确认下载" + row.fileName + "?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function (){
+      }).then(function () {
         return downloadFile(row.fileId)
-      }).then(res =>{
+      }).then(res => {
         this.download(res.data.msg);
       })
     },
diff --git a/hchyun-ui/src/views/system/role/index.vue b/hchyun-ui/src/views/system/role/index.vue
index 43e0fdf..4b55811 100644
--- a/hchyun-ui/src/views/system/role/index.vue
+++ b/hchyun-ui/src/views/system/role/index.vue
@@ -24,7 +24,7 @@
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
-          placeholder="角色状态"
+          placeholder="请选择角色状态"
           clearable
           size="small"
           style="width: 240px"
@@ -37,6 +37,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="角色类型" prop="status">
+        <el-select
+          v-model="queryParams.roleType"
+          placeholder="请选择角色类型"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option label="系统角色" :value="1"/>
+          <el-option label="文件管理角色" :value="2"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
@@ -315,6 +327,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        roleType :undefined,
         roleName: undefined,
         roleKey: undefined,
         status: undefined
diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/FileController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/FileController.java
index 11c1655..6ed88eb 100644
--- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/FileController.java
+++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/FileController.java
@@ -75,6 +75,21 @@ public class FileController extends HcyBaseController {
         }
     }
 
+    @GetMapping("/folder")
+    public AjaxResult getFolder(){
+        try {
+            ServerResult<List<SysFile>> serverResult = fileService.selectFileFolder();
+            if (serverResult.isStart()){
+                return AjaxResult.success(serverResult.getData());
+            }else {
+                return AjaxResult.error(serverResult.getMsg());
+            }
+        } catch (RuntimeException e) {
+            logger.error(e.getMessage());
+            return AjaxResult.error(ReturnConstants.SYS_ERROR);
+        }
+    }
+
     /**
      * 导出文件信息列表
      */
diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java
index 3fb5d47..fa26dd2 100644
--- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java
+++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java
@@ -83,7 +83,7 @@ public class SysRole extends BaseEntity {
      */
     private Long[] deptIds;
 
-    private Integer roleType = 1;
+    private Integer roleType = 0;
 
     public SysRole() {
     }
diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/FileDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/FileDao.java
index 288b972..7b919de 100644
--- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/FileDao.java
+++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/FileDao.java
@@ -27,6 +27,13 @@ public interface FileDao {
      */
     List<SysFile> selectFileList(SysFile sysFile);
 
+    /**
+     * 查询文件夹列表
+     * @return
+     */
+    List<SysFile> selectFileFolder();
+
+
     /**
      * 新增文件信息
      *
diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/FileService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/FileService.java
index 0ec03bd..5bdace1 100644
--- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/FileService.java
+++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/FileService.java
@@ -31,6 +31,12 @@ public interface FileService {
      */
     ServerResult<List<SysFile>> selectFileList(SysFile sysFile);
 
+    /**
+     * 查询文件夹基本信息
+     * @return
+     */
+    ServerResult<List<SysFile>> selectFileFolder();
+
     /**
      * 新增文件信息
      *
diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/FileServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/FileServiceImpl.java
index 20c9deb..24b273c 100644
--- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/FileServiceImpl.java
+++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/FileServiceImpl.java
@@ -73,6 +73,17 @@ public class FileServiceImpl implements FileService {
         }
     }
 
+    @Override
+    public ServerResult<List<SysFile>> selectFileFolder() {
+        try {
+            List<SysFile> sysFiles = fileDao.selectFileFolder();
+            return new ServerResult<>(true,sysFiles);
+        }catch (RuntimeException e){
+            logger.error(e.getMessage());
+            return new ServerResult<List<SysFile>>(false, ReturnConstants.DB_EX);
+        }
+    }
+
     /**
      * 新增文件信息
      *
diff --git a/hchyun/hchyun-system/src/main/resources/mapper/system/FileMapper.xml b/hchyun/hchyun-system/src/main/resources/mapper/system/FileMapper.xml
index 2b2344f..af9b4b2 100644
--- a/hchyun/hchyun-system/src/main/resources/mapper/system/FileMapper.xml
+++ b/hchyun/hchyun-system/src/main/resources/mapper/system/FileMapper.xml
@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <select id="selectFileList" parameterType="SysFile" resultMap="FileResult">
         <include refid="selectFileVo"/>
-        <where>  
+        <where>
+            and is_public != '3'
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileAddr != null  and fileAddr != ''"> and file_addr like concat('%', #{fileAddr}, '%')</if>
             <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
@@ -34,6 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
+    <select id="selectFileFolder" resultMap="FileResult">
+        <include refid="selectFileVo"/>
+        where is_public = '3'
+    </select>
     <select id="selectFileById" parameterType="Long" resultMap="FileResult">
         <include refid="selectFileVo"/>
         where file_id = #{fileId}
diff --git a/hchyun/hchyun-system/src/main/resources/mapper/system/SysRoleMapper.xml b/hchyun/hchyun-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 7269b3e..0461d8c 100644
--- a/hchyun/hchyun-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/hchyun/hchyun-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.del_flag = '0'
-		<if test="roleType != 0">
+		<if test="roleType != 0 and roleType != null">
 			and r.role_type = #{roleType}
 		</if>
 		<if test="roleName != null and roleName != ''">