From a946293f16999876221684c39d8d5c767aefed02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A8=81=E5=8B=9D=20=E5=BC=B5?= Date: Sat, 22 Feb 2025 19:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A0=86=E5=BA=8F=E4=BE=9D=E6=99=82=E9=96=93?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lamiter/Company_detail_tableController.cs | 1 + .../manage/Health_detail_tableController.cs | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/TCM_API/Controllers/lamiter/Company_detail_tableController.cs b/TCM_API/Controllers/lamiter/Company_detail_tableController.cs index 2ed944a..a49cd5a 100644 --- a/TCM_API/Controllers/lamiter/Company_detail_tableController.cs +++ b/TCM_API/Controllers/lamiter/Company_detail_tableController.cs @@ -36,6 +36,7 @@ namespace TCM_API.Controllers.lamiter var data = await(from a in _context.company_detail_table join b in _context.user_table on a.guid equals b.guid into joined from b in joined.DefaultIfEmpty() + orderby a.data_create_time select new { company_name = a.company_name, diff --git a/TCM_API/Controllers/manage/Health_detail_tableController.cs b/TCM_API/Controllers/manage/Health_detail_tableController.cs index 50d83a3..4fb831d 100644 --- a/TCM_API/Controllers/manage/Health_detail_tableController.cs +++ b/TCM_API/Controllers/manage/Health_detail_tableController.cs @@ -33,6 +33,7 @@ namespace TCM_API.Controllers.manage { var data = await (from c in _context.health_detail_table + orderby c.data_create_time select new { health_name = c.health_name, @@ -52,15 +53,16 @@ namespace TCM_API.Controllers.manage { var data = await (from a in _context.health_detail_table - join b in _context.user_table on a.guid equals b.guid into joined - from b in joined.DefaultIfEmpty() // LEFT JOIN - where a.company_guid == guid - select new - { - health_name = a.health_name, - guid = a.guid, - level = b.level - }).ToListAsync(); + join b in _context.user_table on a.guid equals b.guid into joined + from b in joined.DefaultIfEmpty() // LEFT JOIN + where a.company_guid == guid + orderby a.data_create_time + select new + { + health_name = a.health_name, + guid = a.guid, + level = b.level + }).ToListAsync(); return Ok(data); }