From 910ef472ec85fee4b79cdb66ee5c459f89d53f41 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 26 Aug 2021 14:55:35 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=20=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=95=E0=B8=B4=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva_xControllers.cs | 2 ++ .../eva_create_evaluation_detail_processViewModel.cs | 1 - Models/rep_eva_x/rep_eva_xInputModel2.cs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs index 715780c..ca8990a 100644 --- a/ApiControllers/rep_eva_xControllers.cs +++ b/ApiControllers/rep_eva_xControllers.cs @@ -324,6 +324,8 @@ namespace TodoAPI2.Controllers if (i.employee_org != null) i.employee_org = i.employee_org.Replace("แผนก", ""); i.employee_position = p.employee_position; + i.employee_position_full = p.employee_position + checkLevel(p.employee_position_type_id, p.employee_position_level_text, p.employee_fullname); + if (!string.IsNullOrEmpty(p.employee_profile_picture)) { i.image_url = MyHelper.GetConfig(Configuration, "SiteInformation:hr_svc") + "/api/image/" + p.employee_profile_picture; diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs index 8af11e3..67114cf 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs @@ -23,7 +23,6 @@ namespace TodoAPI2.Models public string employee_profile_picture { get; set; } public string employee_position { get; set; } - public string employee_position_type { get; set; } public string employee_position_level { get; set; } diff --git a/Models/rep_eva_x/rep_eva_xInputModel2.cs b/Models/rep_eva_x/rep_eva_xInputModel2.cs index 161961e..25b91d2 100644 --- a/Models/rep_eva_x/rep_eva_xInputModel2.cs +++ b/Models/rep_eva_x/rep_eva_xInputModel2.cs @@ -21,6 +21,7 @@ namespace TodoAPI2.Models public string employee_position_level { get; set; } public string employee_org { get; set; } public string employee_position { get; set; } + public string employee_position_full { get; set; } public string image_url { get; set; } public string chief_fullname { get; set; } public string chief_position { get; set; }