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

no message

Browse source
This commit is contained in:
kittapath 2024-09-17 15:25:27 +07:00
parent b9334a201e
commit 71c8b019aa
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Controllers/DisableController.cs
View file

@ -737,23 +737,23 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
.ToList(); .ToList();
var roles = _httpContextAccessor?.HttpContext?.User?.FindAll(ClaimTypes.Role)?.Select(c => c.Value).ToList(); var roles = _httpContextAccessor?.HttpContext?.User?.FindAll(ClaimTypes.Role)?.Select(c => c.Value).ToList();
if (!roles.Contains("head")) // if (!roles.Contains("head"))
{ // {
var criteria = new List<Guid?>(); // var criteria = new List<Guid?>();
var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable() // var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable()
.FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId)); // .FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId));
if (profileOrganization == null) // if (profileOrganization == null)
return Success(new List<dynamic>()); // return Success(new List<dynamic>());
var ocId = _contextMetadata.Organizations.AsQueryable() // var ocId = _contextMetadata.Organizations.AsQueryable()
.FirstOrDefault(x => x.Id == profileOrganization.OrganizationId); // .FirstOrDefault(x => x.Id == profileOrganization.OrganizationId);
if (ocId == null) // if (ocId == null)
return Success(new List<dynamic>()); // return Success(new List<dynamic>());
criteria = GetAllIdByRoot(ocId.Id); // criteria = GetAllIdByRoot(ocId.Id);
if (criteria.Any()) // if (criteria.Any())
_periodExams = _periodExams.Where(x => x.CreatedUserId == UserId || criteria.Contains(x.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OcId)).ToList(); // _periodExams = _periodExams.Where(x => x.CreatedUserId == UserId || criteria.Contains(x.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OcId)).ToList();
} // }
return Success(_periodExams); return Success(_periodExams);
} }

30
Services/PeriodExamService.cs
View file

@ -167,24 +167,24 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
.ToList(); .ToList();
var roles = _httpContextAccessor?.HttpContext?.User?.FindAll(ClaimTypes.Role)?.Select(c => c.Value).ToList(); var roles = _httpContextAccessor?.HttpContext?.User?.FindAll(ClaimTypes.Role)?.Select(c => c.Value).ToList();
if (!roles.Contains("head")) // if (!roles.Contains("head"))
{ // {
var criteria = new List<Guid?>(); // var criteria = new List<Guid?>();
var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable() // var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable()
.FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId)); // .FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId));
if (profileOrganization == null) // if (profileOrganization == null)
return new List<PeriodExamCandidateResponseItem>(); // return new List<PeriodExamCandidateResponseItem>();
var ocId = _contextMetadata.Organizations.AsQueryable() // var ocId = _contextMetadata.Organizations.AsQueryable()
.FirstOrDefault(x => x.Id == profileOrganization.OrganizationId); // .FirstOrDefault(x => x.Id == profileOrganization.OrganizationId);
if (ocId == null) // if (ocId == null)
return new List<PeriodExamCandidateResponseItem>(); // return new List<PeriodExamCandidateResponseItem>();
criteria = GetAllIdByRoot(ocId.Id); // criteria = GetAllIdByRoot(ocId.Id);
if (criteria.Any()) // if (criteria.Any())
_periodExams = _periodExams.Where(x => x.CreatedUserId == UserId || criteria.Contains(x.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OcId)).ToList(); // _periodExams = _periodExams.Where(x => x.CreatedUserId == UserId || criteria.Contains(x.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OcId)).ToList();
} // }
return _periodExams; return _periodExams;
} }