From 0b0f1f59fa207dd4c97b70eafe231d302fd23c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com>
Date: Mon, 19 Aug 2024 15:48:17 +0800
Subject: [PATCH] 123

---
 asg_form/Controllers/Champion.cs |  2 +-
 asg_form/Controllers/admin.cs    | 40 ++++++++------------------------
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/asg_form/Controllers/Champion.cs b/asg_form/Controllers/Champion.cs
index 7b5dc4c..3699c68 100644
--- a/asg_form/Controllers/Champion.cs
+++ b/asg_form/Controllers/Champion.cs
@@ -85,7 +85,7 @@ namespace asg_form.Controllers
         }
 
 
-            [Route("api/v1/Champion/")]
+        [Route("api/v1/Champion/")]
         [HttpGet]
         public async Task<ActionResult<List<Champion.T_Champion>>> getchampion()
         {
diff --git a/asg_form/Controllers/admin.cs b/asg_form/Controllers/admin.cs
index 4ad1184..f4ff52f 100644
--- a/asg_form/Controllers/admin.cs
+++ b/asg_form/Controllers/admin.cs
@@ -247,51 +247,31 @@ else{
         [Route("api/v2/admin/allperson")]
         [HttpGet]
         [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"))
             {
-                var users = userManager.Users;
-                var userList = new List<object>();
+                var a = new all_record();
 
-                foreach (var user in users)
+                if (keyword == null)
                 {
-                    var isAdmin = await userManager.IsInRoleAsync(user, "admin");
-                    var roles = await userManager.GetRolesAsync(user);
+                    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 }).ToListAsync();
 
-                    userList.Add(new
-                    {
-                        user.Id,
-                        user.Email,
-                        user.chinaname,
-                        user.UserName,
-                        user.Integral,
-                        user.officium,
-                        isAdmin,
-                        roles
-                    });
                 }
-
-                var pagedUsers = userList.Skip((pageindex - 1) * pagesize).Take(pagesize).ToList();
-                var totalCount = userList.Count;
-
-                var result = new all_record
+                else
                 {
-                    cout = totalCount,
-                    msg = pagedUsers
-                };
 
-                return Ok(result);
+                    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();
+                }
+                return Ok(a);
             }
             else
             {
                 return BadRequest(new error_mb { code = 400, message = "无权访问" });
 
             }
-
-
-
-
         }
 
         public class post_user_v2