Migrate & Fix รายการวินัยม่ได้กรองสิทธิ์รายการ #7
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 2m16s

This commit is contained in:
harid 2026-07-17 15:35:36 +07:00
parent 2743edf82f
commit bea7960ea7
11 changed files with 4222 additions and 8 deletions

View file

@ -30,12 +30,14 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly NotificationRepository _repositoryNoti;
private readonly PermissionRepository _permission;
private readonly UserProfileRepository _userProfileRepository;
public DisciplineDisciplinaryController(DisciplineDbContext context,
MinIODisciplineService documentService,
NotificationRepository repositoryNoti,
IHttpContextAccessor httpContextAccessor,
PermissionRepository permission)
PermissionRepository permission,
UserProfileRepository userProfileRepository)
{
// _repository = repository;
_context = context;
@ -43,6 +45,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
_httpContextAccessor = httpContextAccessor;
_repositoryNoti = repositoryNoti;
_permission = permission;
_userProfileRepository = userProfileRepository;
}
#region " Properties "
@ -50,6 +53,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
#endregion
@ -118,15 +122,75 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
// กรองสิทธิ์
string role = jsonData["result"]?.ToString() ?? "";
var profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), token.Replace("Bearer ", ""));
var node = profileAdmin?.Node;
string? nodeIdStr = null;
if (role == "NORMAL" || role == "CHILD")
{
nodeIdStr = node == 4 ? profileAdmin?.Child4DnaId
: node == 3 ? profileAdmin?.Child3DnaId
: node == 2 ? profileAdmin?.Child2DnaId
: node == 1 ? profileAdmin?.Child1DnaId
: node == 0 ? profileAdmin?.RootDnaId
: null;
}
else if (role == "BROTHER")
{
nodeIdStr = node == 4 ? profileAdmin?.Child3DnaId
: node == 3 ? profileAdmin?.Child2DnaId
: node == 2 ? profileAdmin?.Child1DnaId
: (node == 1 || node == 0) ? profileAdmin?.RootDnaId
: null;
}
else if (role == "ROOT")
{
nodeIdStr = profileAdmin?.RootDnaId;
}
Guid? nodeId = Guid.TryParse(nodeIdStr, out var ng) ? ng : (Guid?)null;
var page = req.page <= 0 ? 1 : req.page;
var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
var data_search = (from x in _context.DisciplineDisciplinarys
where x.Title.Contains(keyword) ||
x.DisciplinaryFaultLevel.Contains(keyword) ||
x.DisciplinaryCaseFault.Contains(keyword)
where
(
x.Title.Contains(keyword) ||
x.DisciplinaryFaultLevel.Contains(keyword) ||
x.DisciplinaryCaseFault.Contains(keyword)
)
&&
(
role == "OWNER" ? true :
role == "ROOT" ? x.RootDnaId == nodeId :
role == "CHILD" ? (
node == 4 ? x.Child4DnaId == nodeId :
node == 3 ? x.Child3DnaId == nodeId :
node == 2 ? x.Child2DnaId == nodeId :
node == 1 ? x.Child1DnaId == nodeId :
node == 0 ? x.RootDnaId == nodeId :
true
) :
role == "BROTHER" ? (
node == 4 ? x.Child3DnaId == nodeId :
node == 3 ? x.Child2DnaId == nodeId :
node == 2 ? x.Child1DnaId == nodeId :
(node == 1 || node == 0) ? x.RootDnaId == nodeId :
true
) :
role == "NORMAL" ? (
node == 0 ? x.RootDnaId == nodeId && x.Child1DnaId == null :
node == 1 ? x.Child1DnaId == nodeId && x.Child2DnaId == null :
node == 2 ? x.Child2DnaId == nodeId && x.Child3DnaId == null :
node == 3 ? x.Child3DnaId == nodeId && x.Child4DnaId == null :
node == 4 ? x.Child4DnaId == nodeId :
true
) :
true
)
select x).ToList();
if (status.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();