优化

4 months ago · 34d22fc32a
parent cb117fd047
commit 34d22fc32a
2 changed files with 2984 additions and 2961 deletions
--- a/Model/Tiobon.Web.pdm
+++ b/Model/Tiobon.Web.pdm
--- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs
@ -23,7 +23,7 @@ public class Ghre_RequestController : BaseController<IGhre_RequestServices, Ghre
    public async Task<ServicePageResult<Ghre_RequestDto>> QueryByStatus([FromBody] QueryBody body, string status)
    {
        if (status == "Active")
-            return await _service.QueryFilterPage(body, $"(Status ='{status}' OR (WorkID IS NOT NULL AND WorkState IN (0,1)))");
+            return await _service.QueryFilterPage(body, $"(Status ='Active' OR Status ='Wait' OR (WorkID IS NOT NULL AND WorkState IN (0,1)))");
        else if (status == "Disable")
            return await _service.QueryFilterPage(body, null, false);
        else