From 71c8b019aa71dc5a7a1c89c8d36bccd33d63acf8 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 17 Sep 2024 15:25:27 +0700 Subject: [PATCH] no message --- Controllers/DisableController.cs | 30 +++++++++++++++--------------- Services/PeriodExamService.cs | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Controllers/DisableController.cs b/Controllers/DisableController.cs index 5d13367..580bb36 100644 --- a/Controllers/DisableController.cs +++ b/Controllers/DisableController.cs @@ -737,23 +737,23 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers .ToList(); var roles = _httpContextAccessor?.HttpContext?.User?.FindAll(ClaimTypes.Role)?.Select(c => c.Value).ToList(); - if (!roles.Contains("head")) - { - var criteria = new List(); - var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable() - .FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId)); + // if (!roles.Contains("head")) + // { + // var criteria = new List(); + // var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable() + // .FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId)); - if (profileOrganization == null) - return Success(new List()); + // if (profileOrganization == null) + // return Success(new List()); - var ocId = _contextMetadata.Organizations.AsQueryable() - .FirstOrDefault(x => x.Id == profileOrganization.OrganizationId); - if (ocId == null) - return Success(new List()); - criteria = GetAllIdByRoot(ocId.Id); - 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(); - } + // var ocId = _contextMetadata.Organizations.AsQueryable() + // .FirstOrDefault(x => x.Id == profileOrganization.OrganizationId); + // if (ocId == null) + // return Success(new List()); + // criteria = GetAllIdByRoot(ocId.Id); + // 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(); + // } return Success(_periodExams); } diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index 4f8adb1..f71721e 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -167,24 +167,24 @@ namespace BMA.EHR.Recurit.Exam.Service.Services .ToList(); var roles = _httpContextAccessor?.HttpContext?.User?.FindAll(ClaimTypes.Role)?.Select(c => c.Value).ToList(); - if (!roles.Contains("head")) - { - var criteria = new List(); - var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable() - .FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId)); + // if (!roles.Contains("head")) + // { + // var criteria = new List(); + // var profileOrganization = await _contextMetadata.ProfileOrganizations.AsQueryable() + // .FirstOrDefaultAsync(x => x.UserId == Guid.Parse(UserId)); - if (profileOrganization == null) - return new List(); + // if (profileOrganization == null) + // return new List(); - var ocId = _contextMetadata.Organizations.AsQueryable() - .FirstOrDefault(x => x.Id == profileOrganization.OrganizationId); - if (ocId == null) - return new List(); - criteria = GetAllIdByRoot(ocId.Id); + // var ocId = _contextMetadata.Organizations.AsQueryable() + // .FirstOrDefault(x => x.Id == profileOrganization.OrganizationId); + // if (ocId == null) + // return new List(); + // criteria = GetAllIdByRoot(ocId.Id); - 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(); - } + // 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(); + // } return _periodExams; }