From 9df224d42d3b29f7eff7bde92db10bfee5fb85ea Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 16 Aug 2020 11:45:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=A7=E0=B8=A1=20code=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=88=E0=B8=AD=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=87=E0=B8=95=E0=B8=B2=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_create_evaluation_detailService.cs         | 14 ++++++++++++--
 .../eva_evaluation_group_detailService.cs          | 12 +++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
index 8c824ed..e06394e 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
@@ -114,11 +114,21 @@ namespace TodoAPI2.Models
                 join fk_external_linkage25 in ext.GetAgreeDisagree() on m_eva_create_evaluation_detail.supervisor2_result equals fk_external_linkage25.external_code
                 into external_linkageResult25
                 from fk_external_linkageResult25 in external_linkageResult25.DefaultIfEmpty()
-                
+
+                join sort_dep in ext.GetSortingDep() on fk_external_linkageResult2.department_id equals sort_dep.id
+                into sort_depResult2
+                from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
+
                 where 1 ==1
                 && (m_eva_create_evaluation_detail.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
                 
-                orderby fk_external_linkageResult2.department_code, fk_external_linkageResult2.position_level_id
+                orderby
+                fk_sort_depResult2.external_code,
+                //fk_external_linkageResult2.department_degree_id,
+                //fk_external_linkageResult2.department_code,
+                fk_external_linkageResult2.hpt_position_type_id,
+                fk_external_linkageResult2.hpl_position_level_id,
+                fk_external_linkageResult2.employee_no
                 select new eva_create_evaluation_detailViewModel()
                 {
                     id = m_eva_create_evaluation_detail.id,
diff --git a/Models/eva_evaluation_group_detail/eva_evaluation_group_detailService.cs b/Models/eva_evaluation_group_detail/eva_evaluation_group_detailService.cs
index 2141414..6de9413 100644
--- a/Models/eva_evaluation_group_detail/eva_evaluation_group_detailService.cs
+++ b/Models/eva_evaluation_group_detail/eva_evaluation_group_detailService.cs
@@ -113,13 +113,19 @@ namespace TodoAPI2.Models
                 into external_employeeResult
                 from fk_external_employeeResult in external_employeeResult.DefaultIfEmpty()
 
+                join sort_dep in ext.GetSortingDep() on fk_external_employeeResult.department_id equals sort_dep.id
+                into sort_depResult2
+                from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
+
                 where 1==1
                 && (m_eva_evaluation_group_detail.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue)
 
                 orderby
-                fk_external_employeeResult.department_degree_id,
-                fk_external_employeeResult.department_code,
-                fk_external_employeeResult.position_level_id,
+                fk_sort_depResult2.external_code,
+                //fk_external_employeeResult.department_degree_id,
+                //fk_external_employeeResult.department_code,
+                fk_external_employeeResult.hpt_position_type_id,
+                fk_external_employeeResult.hpl_position_level_id,
                 fk_external_employeeResult.employee_no
                 select new eva_evaluation_group_detailViewModel()
                 {