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

Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop

Browse source
This commit is contained in:
kittapath 2025-08-04 21:22:42 +07:00
commit 7af3618287
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,8 +336,14 @@ namespace BMA.EHR.Insignia.Service.Controllers
//} //}
if (role.Trim().ToLower() == "officer") if (role.Trim().ToLower() == "officer")
{ {
resend.Items = (await _repository.InsigniaHasProfile(result.PeriodId, ocId, status, type)) /* resend.Items = (await _repository.InsigniaHasProfile(result.PeriodId, ocId, status, type))
.Where(x => x.ProfileType!.ToLower() == type.ToLower()).ToList(); .Where(x => x.ProfileType!.ToLower() == type.ToLower()).ToList();*/
var items = await _repository.InsigniaHasProfile(result.PeriodId, ocId, status, type);
resend.Items = (items ?? new List<InsigniaRequestItem>())
.Where(x => x != null && !string.IsNullOrEmpty(x.ProfileType) && x.ProfileType.ToLower() == type.ToLower())
.ToList();
return Success(resend); return Success(resend);
} }
else else
@ -2468,11 +2474,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
receiveDate = profile.DateReceive!.Value, receiveDate = profile.DateReceive!.Value,
dateAnnounce = profile.Date!.Value, dateAnnounce = profile.Date!.Value,
insigniaId = profile.RequestInsignia!.Id, insigniaId = profile.RequestInsignia!.Id,
issue = "", issue = profile!.Issue ?? "",
note = "", note = "",
refCommandDate = null, refCommandDate = null,
refCommandNo = "", refCommandNo = "",
volume = "", volume = profile!.VolumeNo ?? "",
}; };
await _userProfileRepository.PostProfileInsigniaAsync(profileInsigniaBody, AccessToken); await _userProfileRepository.PostProfileInsigniaAsync(profileInsigniaBody, AccessToken);
@ -2490,11 +2496,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
receiveDate = profile.DateReceive!.Value, receiveDate = profile.DateReceive!.Value,
dateAnnounce = profile.Date!.Value, dateAnnounce = profile.Date!.Value,
insigniaId = profile.RequestInsignia!.Id, insigniaId = profile.RequestInsignia!.Id,
issue = "", issue = profile!.Issue ?? "",
note = "", note = "",
refCommandDate = null, refCommandDate = null,
refCommandNo = "", refCommandNo = "",
volume = "", volume = profile!.VolumeNo ?? "",
}; };
await _userProfileRepository.PostProfileEmpInsigniaAsync(profileInsigniaBody, AccessToken); await _userProfileRepository.PostProfileEmpInsigniaAsync(profileInsigniaBody, AccessToken);