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

FIX ระบบวินัย >> ข้อมูลพื้นฐาน (กรรมการ) ข้อมูลรายการเรื่องเรียนไม่แสดง #1707
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2025-08-01 11:40:01 +07:00
parent 593e5a3f57
commit 009de80c3f
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs
View file

@ -65,6 +65,7 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
[HttpGet("{path}")] [HttpGet("{path}")]
public async Task<ActionResult<ResponseObject>> GetDiscipline(string path, int page = 1, int pageSize = 25, string keyword = "") public async Task<ActionResult<ResponseObject>> GetDiscipline(string path, int page = 1, int pageSize = 25, string keyword = "")
{ {
// สิทธิ์การเข้าถึง
path = path.Trim().ToUpper(); path = path.Trim().ToUpper();
string getPermission; string getPermission;
if (path == "MAIN") if (path == "MAIN")
@ -84,21 +85,24 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_INFO"); getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_INFO");
} }
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission); var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200") if (jsonData["status"]?.ToString() != "200")
{ {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} }
// สิทธิ์มองเห็นรายชื่อ
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var profile = await _userProfileRepository.GetUserOC(userId, token.Replace("Bearer ", ""));
if (profile == null)
return Error(GlobalMessages.DataNotFound);
var data_search = (from x in _context.DisciplineDirectors.Include(x => x.DisciplineInvestigate_Directors).Include(x => x.DisciplineDisciplinary_DirectorInvestigates) var data_search = (from x in _context.DisciplineDirectors.Include(x => x.DisciplineInvestigate_Directors).Include(x => x.DisciplineDisciplinary_DirectorInvestigates)
where /*x.Prefix.Contains(keyword) || where (((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) ||
x.FirstName.Contains(keyword) ||
x.LastName.Contains(keyword) ||*/
((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) ||
x.Position.Contains(keyword) || x.Position.Contains(keyword) ||
x.Email.Contains(keyword) || x.Email.Contains(keyword) ||
x.Phone.Contains(keyword) || x.Phone.Contains(keyword) ||
x.Qualification.Contains(keyword) x.Qualification.Contains(keyword)) &&
x.RootDnaId == profile.RootDnaId
select x).ToList(); select x).ToList();
var data = data_search var data = data_search
.Select(x => new .Select(x => new
@ -192,6 +196,7 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
Email = req.email, Email = req.email,
Phone = req.phone, Phone = req.phone,
Qualification = req.qualification, Qualification = req.qualification,
RootDnaId = req.rootDnaId,
CreatedFullName = FullName ?? "System Administrator", CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "", CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,

1
BMA.EHR.Discipline.Service/Requests/DisciplineDirectorRequest.cs
View file

@ -12,5 +12,6 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? email { get; set; } public string? email { get; set; }
public string? phone { get; set; } public string? phone { get; set; }
public string? qualification { get; set; } public string? qualification { get; set; }
public Guid? rootDnaId { get; set; }
} }
} }