From 72d8dd4461f7ca4865756a0efe5a5aa43c3f3abb Mon Sep 17 00:00:00 2001 From: sunliang <593170460@qq.com> Date: Sat, 16 Dec 2023 17:35:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9minion=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20=E6=9F=A5=E8=AF=A2=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E6=9D=83=E9=99=90=E6=8E=92=E5=BA=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/MinioController/MinioApiController.cs | 4 ++-- IBKLinker-Minio/Entity/MinioController/MinioRolePermission.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs index 2b0702d..af22b55 100644 --- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs +++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs @@ -1230,7 +1230,7 @@ namespace IBKLinker_Minio.Controller.MinioController } if (!string.IsNullOrEmpty(EmpowerType)) { - if (EmpowerType == "打印") + if (EmpowerType == "下载/打印") { sql += "and b.PRINT_FLAG=1"; } @@ -1264,7 +1264,7 @@ namespace IBKLinker_Minio.Controller.MinioController } } - request.data = db.Query("select b.*，d.FILE_NAME,d.FILE_PATH from minio_user a left join minio_role_permission b on a.role_id=b.id left join minio_authority c on b.limits_authority_id=c.limits_authority_id left join minio_storage_path d on c.file_id=d.pk where 1=1 " + sql + " ORDER BY a.creator_time").ToList(); + request.data = db.Query("select b.*，d.FILE_NAME,d.FILE_PATH from minio_user a left join minio_role_permission b on a.role_id=b.id left join minio_authority c on b.limits_authority_id=c.limits_authority_id left join minio_storage_path d on c.file_id=d.pk where 1=1 " + sql + " ORDER BY d.PK").ToList(); request.code = "0"; } } diff --git a/IBKLinker-Minio/Entity/MinioController/MinioRolePermission.cs b/IBKLinker-Minio/Entity/MinioController/MinioRolePermission.cs index b8ed86d..a6fdfd5 100644 --- a/IBKLinker-Minio/Entity/MinioController/MinioRolePermission.cs +++ b/IBKLinker-Minio/Entity/MinioController/MinioRolePermission.cs @@ -43,9 +43,9 @@ namespace IBKLinker_Minio.Entity.MinioController /// - ///打印 + ///下载/打印 /// - [Persistent("PRINT_FLAG"), DisplayName("打印")] + [Persistent("PRINT_FLAG"), DisplayName("下载/打印")] public int PrintFlag { get; set; }