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

เช็คสำนักให้ออก
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
kittapath 2025-01-07 21:34:55 +07:00
parent 910dc53808
commit 67d88228c8
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -103,7 +103,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var retirementOthers = await _context.RetirementOthers.AsQueryable() var retirementOthers = await _context.RetirementOthers.AsQueryable()
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) // .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))
.Select(p => new .Select(p => new
{ {
p.Id, p.Id,
@ -721,7 +721,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -742,7 +743,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
CommandExcecuteDate = _null, CommandExcecuteDate = _null,
RemarkHorizontal = _null, RemarkHorizontal = _null,
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
} }
return Success(result); return Success(result);
@ -927,7 +928,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,

2
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -103,7 +103,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var retirementOuts = await _context.RetirementOuts.AsQueryable() var retirementOuts = await _context.RetirementOuts.AsQueryable()
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) // .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))
.Select(p => new .Select(p => new
{ {
p.Id, p.Id,