some small bug
This commit is contained in:
parent
87563c03d4
commit
3f58c35d60
@ -257,14 +257,14 @@ else{
|
|||||||
if (keyword == null)
|
if (keyword == null)
|
||||||
{
|
{
|
||||||
a.cout = userManager.Users.Count();
|
a.cout = userManager.Users.Count();
|
||||||
a.msg = await userManager.Users.Paginate(pageindex, pagesize).Select(a => new { a.Id, a.Email, a.chinaname, a.UserName, a.Integral, a.officium,a.isadmin ,a.Roles}).ToListAsync();
|
a.msg = await userManager.Users.Paginate(pageindex, pagesize).Select(a => new { a.Id, a.Email, a.chinaname, a.UserName, a.Integral, a.officium}).ToListAsync();
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
a.cout = userManager.Users.Where(a => a.chinaname == keyword || a.UserName == keyword || a.Email == keyword).Count();
|
a.cout = userManager.Users.Where(a => a.chinaname == keyword || a.UserName == keyword || a.Email == keyword).Count();
|
||||||
a.msg = await userManager.Users.Where(a => a.chinaname == keyword || a.UserName == keyword || a.Email == keyword).Paginate(pageindex, pagesize).Select(a => new { a.Id, a.Email, a.chinaname, a.UserName, a.Integral, a.officium, a.isadmin, a.Roles }).ToListAsync();
|
a.msg = await userManager.Users.Where(a => a.chinaname == keyword || a.UserName == keyword || a.Email == keyword).Paginate(pageindex, pagesize).Select(a => new { a.Id, a.Email, a.chinaname, a.UserName, a.Integral, a.officium}).ToListAsync();
|
||||||
}
|
}
|
||||||
return Ok(a);
|
return Ok(a);
|
||||||
}
|
}
|
||||||
|
@ -22,8 +22,8 @@ namespace asg_form
|
|||||||
|
|
||||||
public int point { get; set; }
|
public int point { get; set; }
|
||||||
|
|
||||||
public bool isadmin { get; set; }
|
//public bool isadmin { get; set; }
|
||||||
public List<string>? Roles { get; set; }
|
//public List<string>? Roles { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Role : IdentityRole<long>
|
public class Role : IdentityRole<long>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user