diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs index 473c01e..6241fcf 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs @@ -205,8 +205,8 @@ namespace TodoAPI2.Models && (m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id == model.adjust_postponement_id || !model.adjust_postponement_id.HasValue) //&& fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_normal_02.employee_id //&& (m_eva_adjust_postponement_detail_normal_02.is_for_postponement == null?true: m_eva_adjust_postponement_detail_normal_02.is_for_postponement.Value) - - //&& fk_external_linkageResult2.workingstatus == "สถานะปฏิบัติงาน" + + && fk_external_linkageResult2.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" orderby fk_sort_depResult2.external_code, diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs index 74e2cb0..c799018 100644 --- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs +++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs @@ -220,7 +220,7 @@ namespace TodoAPI2.Models //&& (m_eva_adjust_postponement_detail_quota_02.is_for_postponement == null ? true : m_eva_adjust_postponement_detail_quota_02.is_for_postponement.Value) - //&& fk_external_linkageResult2.workingstatus == "สถานะปฏิบัติงาน" + && fk_external_linkageResult2.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" orderby fk_sort_depResult2.external_code,