diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs index d4ec450..dc55799 100644 --- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs +++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs @@ -318,7 +318,7 @@ namespace IBKLinker_Minio.Controller.MinioController { sql += " and a.STATE =" + minioUser.State + ""; } - if (minioUser.RoleId != "") + if (!string.IsNullOrEmpty(minioUser.RoleId)) { sql += " and a.ROLE_ID ='" + minioUser.RoleId + "'"; } @@ -514,6 +514,7 @@ namespace IBKLinker_Minio.Controller.MinioController date.FileLevel = item.FileLevel;//文件层级 date.FileName = item.FileName;//文件名称 date.DownloadNum = item.DownloadNum;//文件下载次数 + date.Version = item.Version;//文件版本 date.CreatorUser = item.CreatorUser;//创建者 date.CreatorTime = item.CreatorTime;//创建时间 date.AssociationFilePk = item.AssociationFilePk;//关联文件PK @@ -522,6 +523,7 @@ namespace IBKLinker_Minio.Controller.MinioController date.AssociationFileName = item.AssociationFileName;//关联文件名称 date.AssociationFileLevel = item.AssociationFileLevel;//关联文件层级 date.AssociationDownloadNum = item.AssociationDownloadNum;//关联文件下载次数 + date.AssociationVersion = item.AssociationVersion;//关联文件版本 #endregion } else //如果不等与的话将关联文件与被关联文件信息调换位置返回前端 @@ -534,6 +536,7 @@ namespace IBKLinker_Minio.Controller.MinioController date.FileLevel = item.AssociationFileLevel;//文件层级 date.FileName = item.AssociationFileName;//文件名称 date.DownloadNum = item.AssociationDownloadNum;//文件下载次数 + date.Version = item.AssociationVersion;//文件版本 date.CreatorUser = item.CreatorUser;//创建者 date.CreatorTime = item.CreatorTime;//创建时间 date.AssociationFilePk = item.FilePk;//关联文件PK @@ -542,6 +545,7 @@ namespace IBKLinker_Minio.Controller.MinioController date.AssociationFileName = item.FileName;//关联文件名称 date.AssociationFileLevel = item.FileLevel;//关联文件层级 date.AssociationDownloadNum = item.DownloadNum;//关联文件下载次数 + date.AssociationVersion = item.Version;//关联文件版本 #endregion } result.Add(date);//添加数据到list @@ -1151,7 +1155,7 @@ namespace IBKLinker_Minio.Controller.MinioController sql += " and UPK =" + int.Parse(PK); } - date = db.Query("select * from MINIO_STORAGE_PATH where 1=1 " + sql + "and CLEAR_FLAG='0' ORDER BY PK").ToList(); + date = db.Query("select * from MINIO_STORAGE_PATH where 1=1 " + sql + "and CLEAR_FLAG='0' ORDER BY CREATOR_TIME desc").ToList(); } return date; @@ -1539,5 +1543,7 @@ namespace IBKLinker_Minio.Controller.MinioController return result; } #endregion + + } } diff --git a/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs b/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs index cce8399..0422e0a 100644 --- a/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs +++ b/IBKLinker-Minio/Entity/MinioController/MinioFileassociation.cs @@ -119,5 +119,19 @@ namespace IBKLinker_Minio.Entity.MinioController public DateTime? CreatorTime { get; set; } + /// + ///文件版本 + /// + [Persistent("VERSION"), DisplayName("文件版本")] + public string Version { get; set; } + + + /// + ///关联文件版本 + /// + [Persistent("ASSOCIATION_VERSION"), DisplayName("创建时间")] + public string AssociationVersion { get; set; } + + } }