diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
index 359f426..53ed6e8 100644
--- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
+++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs
@@ -167,12 +167,11 @@ namespace IBKLinker_Minio.Controller.MinioController
                 {
                     string sql = string.Empty;
                     IList<MinioAuthority> result = new List<MinioAuthority>();
-                    if (!string.IsNullOrEmpty(minioAuthority.LimitsAuthorityId.ToString()))
+                    if (minioAuthority.LimitsAuthorityId >0)
                     {
                         sql += " and  LIMITS_AUTHORITY_ID ='" + minioAuthority.LimitsAuthorityId + "'";
                     }
-
-                    request.data = db.Query<MinioAuthority>("select * from MINIO_AUTHORITY where 1=1 " + sql + " ORDER BY PK");
+                    request.data = db.Query<MinioAuthority>("select * from MINIO_AUTHORITY where 1=1 " + sql + " ORDER BY ID");
                     request.code = "0";
                 }
             }
@@ -551,26 +550,48 @@ namespace IBKLinker_Minio.Controller.MinioController
         /// </summary>
         /// <param name="master">需要删除的数据</param>
         [HttpPost, Route("RemoveRolePermission")]
-        public RequestEntity RemoveRolePermission(List<MinioRolePermission> master)
+        public RequestEntity RemoveRolePermission(MinioRolePermission data)
         {
             RequestEntity request = new RequestEntity();
-            try
+            IList<MinioUser> MUData = new List<MinioUser>();
+            IList<MinioUser> UdpData = new List<MinioUser>();
+            string sql = "";
+            using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
             {
-                using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
+                try
                 {
-                    db.BeginTransaction();
-
-                    db.Delete<MinioRolePermission>(master);
-
-                    db.Commit();
-                    request.code = "0";
+                    if (data != null)
+                    {
+                        MUData = db.Query<MinioUser>("select * from MINIO_USER where 1=1 and  ROLE_ID='"+data.Id+"'");//查询用户表中使用要被删除的角色
+                        db.BeginTransaction();//启动事务
+                        if (MUData.Count > 0)
+                        {
+                            foreach (var item in MUData)
+                            {
+                                MinioUser date = new MinioUser();
+                                date.UserId = item.UserId;//用户ID
+                                date.UserName = item.UserName;//用户姓名
+                                date.RoleId = 0;//角色ID（将角色id改成0）
+                                date.CreatorUser = item.CreatorUser;//创建人
+                                date.State = item.State;//状态
+                                date.CreatorTime = item.CreatorTime;//创建时间
+                                UdpData.Add(date);//将数据加入list中
+                            }
+                            db.Update<MinioUser>(UdpData);
+                        }
+                        sql = string.Format("delete from MINIO_ROLE_PERMISSION where 1=1 and PK={0}", data.Pk);
+                        db.Execute(sql);
+                        db.Commit();//提交事务
+                        request.code = "0";
+                        request.msg = "删除成功";
+                    }
+                }
+                catch (Exception ex)
+                {
+                    db.Rollback();//回滚
+                    request.code = "1";
+                    logger.ErrorFormat("主表:MINIO_ROLE_PERMISSION，创建数据库连接对象失败，错误原因:{0}", ex);
                 }
-            }
-            catch (Exception ex)
-            {
-                request.code = "1";
-
-                logger.ErrorFormat("主表:MINIO_ROLE_PERMISSION，创建数据库连接对象失败，错误原因:{0}", ex);
             }
             return request;
         }
@@ -632,6 +653,7 @@ namespace IBKLinker_Minio.Controller.MinioController
                         foreach (var item in minioStoragePath)
                         {
                             MinioStoragePath data = new MinioStoragePath();
+                            MinioOperationlog MOdata = new MinioOperationlog();
                             date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where pk='" + minioStoragePath[0].Upk + "' ORDER BY PK").ToList();
                             if (item.FileType == 0) //如果是文件夹
                             {
@@ -673,20 +695,6 @@ namespace IBKLinker_Minio.Controller.MinioController
                             }
                             if (item.FileType == 1)//如果是文件
                             {
-                                string type = "";
-                                if (item.FileCategory == "doc")
-                                {
-                                    type = "application/msword";
-                                }
-                                else if (item.FileCategory == "pdf")
-                                {
-                                    type = "application/pdf";
-                                }
-                                else if (item.FileCategory == "docx") 
-                                {
-                                    type = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-                                }
-                                
                                 var contentType = item.FileCategory;
                                 string strBase64 = item.Bate64;//取文件base64流数据
                                 byte[] bt = Convert.FromBase64String(strBase64);//获取html base64
@@ -706,6 +714,14 @@ namespace IBKLinker_Minio.Controller.MinioController
                                     db.Insert<MinioStoragePath>(data);
                                     request.msg = "文件上传成功！";
                                     request.code = "0";
+                                    #region 记录日志
+                                    MOdata.Pk = Convert.ToInt32(db.QueryScalar("select S_MINIO_OPERATIONLOG.nextval from dual"));///拿到表自增长的值赋值给自增长主键pk;
+                                    MOdata.OperateUser = item.CreatorUser;//操作者
+                                    MOdata.OperateTime = DateTime.Now;//操作时间
+                                    MOdata.Operater = item.CreatorUser + "上传了一个新的文档，" + item.FileName + DateTime.Now.ToString();//操作
+                                    MOdata.CreationTime = DateTime.Now;//创建时间
+                                    db.Insert<MinioOperationlog>(MOdata);//写入数据库
+                                    #endregion
                                 }
                                 else
                                 {
@@ -1333,8 +1349,6 @@ namespace IBKLinker_Minio.Controller.MinioController
             }
         }
         #endregion
-        #region
-
-        #endregion
+        
     }
 }