Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2023-08-28 13:26:33 +07:00
commit ec39bf1505
2 changed files with 1 additions and 1 deletions

View file

@ -569,7 +569,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
public async Task<ActionResult<ResponseObject>> GetBorrowReturnInsignia(Guid insigniaManageProfileId) public async Task<ActionResult<ResponseObject>> GetBorrowReturnInsignia(Guid insigniaManageProfileId)
{ {
var data = await _context.InsigniaManageProfiles.AsQueryable() var data = await _context.InsigniaManageProfiles.AsQueryable()
.Where(x => x.Id == insigniaManageProfileId) .Where(x => insigniaManageProfileId == Guid.Parse("00000000-0000-0000-0000-000000000000") ? x.Id != null : x.Id == insigniaManageProfileId)
.Select(p => new .Select(p => new
{ {
Id = p.Id, Id = p.Id,