From 0697cdd3eed27fd63e13b05a9a82932582661036 Mon Sep 17 00:00:00 2001 From: moss <> Date: Fri, 18 Apr 2025 10:14:12 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B4?= =?UTF-8?q?=E0=B8=81=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RetirementResignController.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 63ff1b91..68331ad6 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -343,7 +343,7 @@ namespace BMA.EHR.Retirement.Service.Controllers .FirstOrDefaultAsync(); if (dataMain == null) return Error(GlobalMessages.RetirementResignNotFound, 404); - + Console.WriteLine("xxxx"); if (dataMain.IsCancel != true) { var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN"); @@ -351,8 +351,13 @@ namespace BMA.EHR.Retirement.Service.Controllers .Where(x => x.Id == id) .Where(x => x.CreatedUserId == UserId) .FirstOrDefaultAsync(); + Console.WriteLine("xxxx"); if (getWorkflow == false && createdUserId == null) { + Console.WriteLine("xxxx"); + Console.WriteLine(UserId); + Console.WriteLine(createdUserId); + Console.WriteLine(getWorkflow); var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN"); var jsonData = JsonConvert.DeserializeObject(getPermission); if (jsonData["status"]?.ToString() != "200") @@ -512,13 +517,19 @@ namespace BMA.EHR.Retirement.Service.Controllers } else { + Console.WriteLine("xxx1x"); var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL"); var createdUserId = await _context.RetirementResignCancels.AsQueryable() .Where(x => x.CreatedUserId == UserId) - .Where(x => x.Id == id) + .Where(x => x.RetirementResign.Id == id) .FirstOrDefaultAsync(); + Console.WriteLine("xxx2x"); if (getWorkflow == false && createdUserId == null) { + Console.WriteLine("xx3xx"); + Console.WriteLine(UserId); + Console.WriteLine(createdUserId); + Console.WriteLine(getWorkflow); var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN"); var jsonData = JsonConvert.DeserializeObject(getPermission); if (jsonData["status"]?.ToString() != "200")