diff --git a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs index 1364a90..48143c4 100644 --- a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs +++ b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs @@ -79,7 +79,7 @@ namespace TodoAPI2.Models { var entity = _repository.Get(id); var i = Mapper.Map(entity); - var all_emp = emp.GetListByemployee_type(null, null); + var all_emp = emp.GetAllEmployee(); i.item_employee_id = all_emp.ToList(); @@ -88,7 +88,7 @@ namespace TodoAPI2.Models public eva_adjust_postponement_detail_migrationWithSelectionViewModel GetBlankItem() { var i = new eva_adjust_postponement_detail_migrationWithSelectionViewModel(); - var all_emp = emp.GetListByemployee_type(null, null); + var all_emp = emp.GetAllEmployee(); i.item_employee_id = all_emp.ToList(); diff --git a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs index 5d3aeeb..8ae0da3 100644 --- a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs +++ b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs @@ -83,7 +83,7 @@ namespace TodoAPI2.Models var entity = _repository.Get(id); var i = Mapper.Map(entity); i.item_create_evaluation_id = (from x in _repository.Context.eva_create_evaluation select x).ToList(); - var all_emp = emp.GetListByemployee_type(null, null); + var all_emp = emp.GetAllEmployee(); i.item_managed_by = all_emp.ToList(); @@ -93,7 +93,7 @@ namespace TodoAPI2.Models { var i = new eva_adjust_postponement_migrationWithSelectionViewModel(); i.item_create_evaluation_id = (from x in _repository.Context.eva_create_evaluation select x).ToList(); - var all_emp = emp.GetListByemployee_type(null, null); + var all_emp = emp.GetAllEmployee(); i.item_managed_by = all_emp.ToList(); @@ -240,6 +240,8 @@ namespace TodoAPI2.Models item.adjust_postponement_id = id; item.adjust_postponement_quota_id = id; + if (employee_no != null) employee_no = employee_no.Trim().Replace(" ", ""); + var employee = (from qq in all_emp where qq.employee_no == employee_no select qq).FirstOrDefault(); if (employee == null) { diff --git a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js index 9888515..39853de 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js +++ b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js @@ -42,8 +42,8 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) { function eva_adjust_postponement_detail_migration_GetFromForm() { var eva_adjust_postponement_detail_migrationObject = new Object(); eva_adjust_postponement_detail_migrationObject.id = $("#eva_adjust_postponement_detail_migration_id").val(); - eva_adjust_postponement_detail_migrationObject.adjust_postponement_id = $("#eva_adjust_postponement_detail_migration_adjust_postponement_id").val(); - eva_adjust_postponement_detail_migrationObject.adjust_postponement_quota_id = $("#eva_adjust_postponement_detail_migration_adjust_postponement_quota_id").val(); + eva_adjust_postponement_detail_migrationObject.adjust_postponement_id = getUrlParameter("id"); + eva_adjust_postponement_detail_migrationObject.adjust_postponement_quota_id = getUrlParameter("id"); eva_adjust_postponement_detail_migrationObject.employee_id = $("#eva_adjust_postponement_detail_migration_employee_id").val(); eva_adjust_postponement_detail_migrationObject.sarary = $("#eva_adjust_postponement_detail_migration_sarary").val(); eva_adjust_postponement_detail_migrationObject.cost_living = $("#eva_adjust_postponement_detail_migration_cost_living").val();