From 686f22eddb47a8313bc7160cc8f6eb9d3da69074 Mon Sep 17 00:00:00 2001 From: nakorn Date: Wed, 13 Oct 2021 21:12:36 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=E0=B8=81=E0=B8=A3?= =?UTF-8?q?=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AD=E0=B8=AD?= =?UTF-8?q?=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_detail_normal_02Service.cs | 4 ++-- .../eva_adjust_postponement_detail_quota_02Service.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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,