diff --git a/asg_form/Controllers/admin.cs b/asg_form/Controllers/admin.cs index 58e271d..e720934 100644 --- a/asg_form/Controllers/admin.cs +++ b/asg_form/Controllers/admin.cs @@ -257,14 +257,14 @@ else{ if (keyword == null) { 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 { 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); } diff --git a/asg_form/User.cs b/asg_form/User.cs index a1718ce..33efc8e 100644 --- a/asg_form/User.cs +++ b/asg_form/User.cs @@ -22,8 +22,8 @@ namespace asg_form public int point { get; set; } - public bool isadmin { get; set; } - public List? Roles { get; set; } + //public bool isadmin { get; set; } + //public List? Roles { get; set; } } public class Role : IdentityRole