From 79b78a5b11bcb694d8a32729b5e3ab83ae9dfad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Tue, 3 Sep 2024 10:54:04 +0800 Subject: [PATCH] 222 --- asg_form/Controllers/AssignmentController.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/asg_form/Controllers/AssignmentController.cs b/asg_form/Controllers/AssignmentController.cs index 72153bb..bee4396 100644 --- a/asg_form/Controllers/AssignmentController.cs +++ b/asg_form/Controllers/AssignmentController.cs @@ -10,6 +10,7 @@ using NPOI.HPSF; using System.Security.Claims; using static Microsoft.EntityFrameworkCore.DbLoggerCategory; using System.Web; +using System.Net.NetworkInformation; namespace asg_form.Controllers { @@ -152,9 +153,9 @@ namespace asg_form.Controllers [Route("api/v1/admin/FindTasks")] [HttpGet] [Authorize] - public async Task> FindTasks([FromQuery] string chinaname = null,string st = null) + public async Task> FindTasks([FromQuery] string chinaname = null,string status = null) { - string encodedChinaname = HttpUtility.UrlEncode(chinaname); + //string encodedChinaname = HttpUtility.UrlEncode(chinaname); if (!this.User.FindAll(ClaimTypes.Role).Any(a => a.Value == "admin")) { @@ -166,15 +167,15 @@ namespace asg_form.Controllers if (!string.IsNullOrEmpty(chinaname)) { - query = query.Where(n => n.chinaname.Contains(encodedChinaname)); + query = query.Where(n => n.chinaname.Contains(chinaname)); } - if (!string.IsNullOrEmpty(st)) + if (!string.IsNullOrEmpty(status)) { - query = query.Where(n => n.status == st); + query = query.Where(n => n.status == status); } - return query.OrderByDescending(a => a.chinaname).ToList(); + return query.OrderByDescending(a => a.status).ToList(); } } }