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

Merge

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-12-26 16:03:47 +07:00
parent 3bb92d337a
commit d9d1a99497
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

@ -322,8 +322,8 @@ namespace BMA.EHR.Application.Repositories
LastInsignia = p.LastInsignia,
LastInsigniaId = p.LastInsigniaId,
Salary = p.Salary,
PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
Amount = p.Amount ?? 0,
PositionSalaryAmount = p.PositionSalaryAmount,
Amount = p.Amount,
RootId = p.RootId,
Root = p.Root,
RequestInsignia = GetInsigniaByName("เบญจมาภรณ์มงกุฎไทย"),
@ -831,8 +831,8 @@ namespace BMA.EHR.Application.Repositories
RequestInsignia = GetInsigniaByName("จัตุรถาภรณ์มงกุฎไทย"),
Seq = 2,
Gender = p.Gender,
PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
Amount = p.Amount ?? 0,
PositionSalaryAmount = p.PositionSalaryAmount,
Amount = p.Amount,
RootId = p.RootId,
Root = p.Root,
MatchingConditions = new List<MatchingCondition>