diff --git a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs index d8cf81d..ff317c1 100644 --- a/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs +++ b/IBKLinker-Minio/Controller/MinioController/MinioApiController.cs @@ -186,7 +186,7 @@ namespace IBKLinker_Minio.Controller.MinioController #endregion - #region minio角色表 + #region minio用户表 /// /// 添加minio角色表 /// @@ -218,7 +218,7 @@ namespace IBKLinker_Minio.Controller.MinioController return request; } /// - /// 修改minio角色表 + /// 修改minio用户表 /// /// 修改数据 [HttpPost, Route("UpdateUSER")] @@ -288,7 +288,7 @@ namespace IBKLinker_Minio.Controller.MinioController /// - /// 查询minio角色表 + /// 查询minio用户表 /// /// [HttpPost, Route("GetUSER")] @@ -317,7 +317,7 @@ namespace IBKLinker_Minio.Controller.MinioController { sql += " and a.ROLE_ID =" + minioUser.RoleId + ""; } - request.data = db.Query("select a.*,b.ID as RoleName from MINIO_USER a left join MINIO_ROLE_PERMISSION b on a. ROLE_ID=b.ID where 1=1 " + sql + " ORDER BY USER_ID"); + request.data = db.Query("select a.*,b.Role_Name as RoleName from MINIO_USER a left join MINIO_ROLE_PERMISSION b on a. ROLE_ID=b.ID where 1=1 " + sql + " ORDER BY USER_ID"); request.code = "0"; } } diff --git a/IBKLinker-Minio/Entity/MinioController/MinioUser.cs b/IBKLinker-Minio/Entity/MinioController/MinioUser.cs index 715f4b2..ec96d41 100644 --- a/IBKLinker-Minio/Entity/MinioController/MinioUser.cs +++ b/IBKLinker-Minio/Entity/MinioController/MinioUser.cs @@ -37,7 +37,7 @@ namespace IBKLinker_Minio.Entity.MinioController ///角色ID /// [Persistent(false), DisplayName("角色名称")] - public int RoleName { get; set; } + public string RoleName { get; set; } /// ///创建人