Merge branch 'master' of http://118.195.204.252:8080/sunliang/MinIO

IBKLinker-Minio/Controller/MinioController/MinioApiController.cs

@@ -849,8 +849,7 @@ namespace IBKLinker_Minio.Controller.MinioController
                 {
                     string sql = string.Empty;
 
-
-                    date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where  CLEAR_FLAG='0' ORDER BY PK").ToList();
+                    date = db.Query<MinioStoragePath>("select * from MINIO_STORAGE_PATH where UPK=0 AND FILE_LEVEL=1 and   CLEAR_FLAG='0' ORDER BY PK").ToList();
 
                 }
                 if (date.Count > 0)
@@ -861,8 +860,9 @@ namespace IBKLinker_Minio.Controller.MinioController
 
                         model.Pk = item.Pk;
                         model.FileName = item.FileName;
-                        model.FilePate = item.FilePath;
+                        model.FilePath = item.FilePath;
                         model.FileType = item.FileType;
+                        model.FileLever = item.FileLevel;
                         model.requstStoragePaths = new List<StoragePath>();
                         List<MinioStoragePath> ds = GetMenuTree(item.Pk.ToString());
                         foreach (var items in ds)
@@ -870,8 +870,9 @@ namespace IBKLinker_Minio.Controller.MinioController
                             StoragePath models = new StoragePath();
                             models.Pk = items.Pk;
                             models.FileName = items.FileName;
-                            models.FilePate = items.FilePath;
+                            models.FilePath = items.FilePath;
                             models.FileType = items.FileType;
+                            models.FileLever = items.FileLevel;
                             model.requstStoragePaths.Add(models);
                         }
                         requstStoragePaths.Add(model);

IBKLinker-Minio/Entity/MinioController/RequstStoragePath.cs

@@ -27,7 +27,11 @@ namespace IBKLinker_Minio.Entity.MinioController
         /// <summary>
         ///文件路径
         /// </summary>
-        public string FilePate { get; set; }
+        public string FilePath { get; set; }
+        /// <summary>
+        ///层级
+        /// </summary>
+        public int  FileLever { get; set; }
     }
     public class RequstStoragePath: StoragePath
     {
@@ -45,6 +49,6 @@ namespace IBKLinker_Minio.Entity.MinioController
         ///文件路径
         /// </summary>
         [Persistent("FILE_PATH"), DisplayName("文件路径")]
-        public string FilePate { get; set; }
+        public string FilePath { get; set; }
     }
 }