luolan/asg_backend
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

222

Browse Source
This commit is contained in:
王炜翔 2024-09-03 10:54:04 +08:00
parent dc4a18bf99
commit 79b78a5b11
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asg_form/Controllers/AssignmentController.cs
View File

@ -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<ActionResult<object>> FindTasks([FromQuery] string chinaname = null,string st = null)
public async Task<ActionResult<object>> 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();
}
}
}