hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้ list พ้น

Browse source
This commit is contained in:
kittapath 2024-11-14 18:04:20 +07:00
parent bebd9620a5
commit 817f7a91ac
8 changed files with 92 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
View file

@ -377,7 +377,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
Document = result.Document,
Items = new List<InsigniaRequestItem>()
};
GetIsOfficerDto RoleInsignia = await _userProfileRepository.GetIsOfficerRootAsync(AccessToken, "INSIGNIA");
GetIsOfficerDto RoleInsignia = await _userProfileRepository.GetIsOfficerRootAsync(AccessToken, "SYS_INSIGNIA_MANAGE");
if (RoleInsignia.isOfficer == true && result.RequestStatus != "st6")
return Success(resend);
if (RoleInsignia.isDirector == true && (result.RequestStatus == "st1" || result.RequestStatus == "st2"))
@ -976,7 +976,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
var orgAllCount = await _context.InsigniaRequests
.Where(x => x.Period == insigniaPeriod)
.ToListAsync();
GetIsOfficerDto RoleInsignia = await _userProfileRepository.GetIsOfficerRootAsync(AccessToken, "INSIGNIA");
GetIsOfficerDto RoleInsignia = await _userProfileRepository.GetIsOfficerRootAsync(AccessToken, "SYS_INSIGNIA_MANAGE");
var allUserUser = await _context.InsigniaRequests
.Where(x => x.Period == insigniaPeriod)
.Where(x => RoleInsignia.isOfficer == true ? x.RequestStatus == "st6" : (RoleInsignia.isDirector == true ? (x.RequestStatus != "st1" && x.RequestStatus != "st2") : x.Id != null))