From 6538420ec2bbba1f57a2fe08af6ae17a0f4308f3 Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Thu, 4 Jan 2024 18:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=AD=E8=A7=92=E8=89=B2=E6=8E=A7=E5=88=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=EF=BC=8C=E5=90=91=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E5=85=B3=E8=81=94=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8E=E8=A2=AB=E5=85=B3=E8=81=94=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MinioController/MinioApiController.cs          | 10 ++++++++--
 .../Entity/MinioController/MinioFileassociation.cs | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

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<MinioStoragePath>("select * from MINIO_STORAGE_PATH where 1=1 " + sql + "and  CLEAR_FLAG='0'   ORDER BY PK").ToList();
+                date = db.Query<MinioStoragePath>("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; }
 
 
+        /// <summary>
+        ///文件版本
+        /// </summary>
+        [Persistent("VERSION"), DisplayName("文件版本")]
+        public string Version { get; set; }
+
+
+        /// <summary>
+        ///关联文件版本
+        /// </summary>
+        [Persistent("ASSOCIATION_VERSION"), DisplayName("创建时间")]
+        public string AssociationVersion { get; set; }
+
+
     }
 }