@ -301,12 +301,23 @@ namespace IBKLinker_Minio.Controller.MinioController
{
{
string sql = string . Empty ;
string sql = string . Empty ;
IList < MinioUser > result = new List < MinioUser > ( ) ;
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 + "'" ;
}
}
if ( ! string . IsNullOrEmpty ( minioUser . UserId ) )
request . data = db . Query < MinioUser > ( "select * from MINIO_USER where 1=1 " + sql + " ORDER BY PK" ) ;
{
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" ;
request . code = "0" ;
}
}
}
}
@ -500,7 +511,7 @@ namespace IBKLinker_Minio.Controller.MinioController
/// </summary>
/// </summary>
/// <param name="data">修改数据</param>
/// <param name="data">修改数据</param>
[HttpPost, Route("UpdateRolePermission")]
[HttpPost, Route("UpdateRolePermission")]
public RequestEntity UpdateRolePermission ( List< MinioRolePermission> data )
public RequestEntity UpdateRolePermission ( MinioRolePermission data )
{
{
RequestEntity request = new RequestEntity ( ) ;
RequestEntity request = new RequestEntity ( ) ;
try
try