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; }