diff --git a/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs b/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs index c256fc09..28dcddba 100644 --- a/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs +++ b/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs @@ -67,6 +67,7 @@ public class AdminMonthlyOverviewListViewModel public long WorkshopId { get; set; } public string WorkshopName { get; set; } public string WorkshopArchiveCode { get; set; } + public int WorkshopArchiveCodeInt { get; set; } public string Province { get; set; } public string City { get; set; } public string Address { get; set; } diff --git a/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs b/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs index 7c1fda57..62e0544c 100644 --- a/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs +++ b/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs @@ -161,6 +161,7 @@ public class AdminMonthlyOverviewRepository : RepositoryBase x.IsBlock).ToList(); + }).OrderBy(x => x.IsBlock).ThenBy(x=>x.WorkshopArchiveCodeInt).ToList(); return adminMonthlyOverviewList;