--角色查询接口修改，角色信息修改接口修改，修改角色实体类

IBKLinker-Minio/Controller/MinioController/MinioApiController.cs

@@ -301,12 +301,23 @@ namespace IBKLinker_Minio.Controller.MinioController
                 {
                     string sql = string.Empty;
                     IList<MinioUser> result = new List<MinioUser>();
-                    if (!string.IsNullOrEmpty(minioUser.UserName.ToString()))
+                    if (!string.IsNullOrEmpty(minioUser.UserName))
                     {
-                        sql += " and  USER_NAME ='" + minioUser.UserName + "'";
+                        sql += " and  a.USER_NAME ='" + minioUser.UserName + "'";
                     }
-
-                    request.data = db.Query<MinioUser>("select * from MINIO_USER where 1=1 " + sql + " ORDER BY PK");
+                    if (!string.IsNullOrEmpty(minioUser.UserId))
+                    {
+                        sql += " and  a.USER_ID ='" + minioUser.UserId + "'";
+                    }
+                    if (!string.IsNullOrEmpty(minioUser.State.ToString()))
+                    {
+                        sql += " and  a.STATE =" + minioUser.State + "";
+                    }
+                    if (minioUser.RoleId>0)
+                    {
+                        sql += " and  a.ROLE_ID =" + minioUser.RoleId + "";
+                    }
+                    request.data = db.Query<MinioUser>("select a.*,b.ROLE_ID as  RoleName from MINIO_USER a left  join  MINIO_ROLE_PERMISSION b on  a. ROLE_ID=b.ROLE_ID  where 1=1 " + sql + " ORDER BY USER_ID");
                     request.code = "0";
                 }
             }
@@ -500,7 +511,7 @@ namespace IBKLinker_Minio.Controller.MinioController
         /// </summary>
         /// <param name="data">修改数据</param>
         [HttpPost, Route("UpdateRolePermission")]
-        public RequestEntity UpdateRolePermission(List<MinioRolePermission> data)
+        public RequestEntity UpdateRolePermission(MinioRolePermission data)
         {
             RequestEntity request = new RequestEntity();
             try

IBKLinker-Minio/Entity/MinioController/MinioUser.cs

@@ -33,7 +33,11 @@ namespace IBKLinker_Minio.Entity.MinioController
         /// </summary>
         [Persistent("ROLE_ID"), DisplayName("角色ID")]
         public int RoleId { get; set; }
-
+        /// <summary>
+        ///角色ID
+        /// </summary>
+        [Persistent(false), DisplayName("角色名称")]
+        public int RoleName { get; set; }
 
         /// <summary>
         ///创建人