Fix รายการให้ออกส่ง status เป็นว่างรายการไม่แสดงทั้งหมด #1654
Some checks failed
release-dev / release-dev (push) Failing after 10s
Some checks failed
release-dev / release-dev (push) Failing after 10s
This commit is contained in:
parent
aef2d3381a
commit
3384c520d7
1 changed files with 3 additions and 3 deletions
|
|
@ -75,7 +75,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||||
[HttpGet("{type}")]
|
[HttpGet("{type}")]
|
||||||
public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type, string? status = "WAITTING")
|
public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type, string? status = "")
|
||||||
{
|
{
|
||||||
string role = "";
|
string role = "";
|
||||||
if (type.Trim().ToUpper() == "OFFICER")
|
if (type.Trim().ToUpper() == "OFFICER")
|
||||||
|
|
@ -173,8 +173,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
p.child4DnaOldId,
|
p.child4DnaOldId,
|
||||||
})
|
})
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
//if (status != null && status.Trim().ToUpper() != "WAITTING")
|
|
||||||
if (status != null)
|
if (!string.IsNullOrEmpty(status))
|
||||||
retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
|
retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
|
||||||
|
|
||||||
if (role == "OWNER")
|
if (role == "OWNER")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue