change2.0

This commit is contained in:
王炜翔 2024-08-18 17:24:04 +08:00
parent 8105f6f144
commit 8d6e40e67c
2 changed files with 8 additions and 2 deletions

View File

@ -87,6 +87,7 @@ namespace asg_form.Controllers
builder.Property(e => e.msg).IsRequired(); builder.Property(e => e.msg).IsRequired();
builder.Property(e => e.Title).IsRequired(); builder.Property(e => e.Title).IsRequired();
builder.Property(e => e.time).IsRequired(); builder.Property(e => e.time).IsRequired();
builder.Property(e => e.Type).IsRequired();
} }
} }

View File

@ -249,9 +249,14 @@ else{
[Authorize] [Authorize]
public async Task<ActionResult<post_user_v2>> getalladmin_v2(string? keyword, short pageindex=1, short pagesize = 10) public async Task<ActionResult<post_user_v2>> getalladmin_v2(string? keyword, short pageindex=1, short pagesize = 10)
{ {
if (this.User.FindAll(ClaimTypes.Role).Any(a => a.Value == "admin")) string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value;
var user = await userManager.FindByIdAsync(id);
var isadmin = await userManager.IsInRoleAsync(user, "admin");
List<string> roles = (List<string>)await userManager.GetRolesAsync(user);
if (isadmin)
{ {
var a = new all_record(); var a = new all_record();
if (keyword == null) if (keyword == null)
{ {
a.cout = userManager.Users.Count(); a.cout = userManager.Users.Count();
@ -264,7 +269,7 @@ 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 }).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(new { data = a,isadmin, roles });
} }
else else