From a7287db2ada9ef606db5fe81cc8b66e2da44d345 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 07 八月 2025 10:56:22 +0800
Subject: [PATCH] pref:菜单排序
---
FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenusQueryHandler.cs | 2 +-
FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenuQueryHandler.cs | 1 +
FlexJobApi.User.Application/Menus/Queries/GetMenusQueryHandler.cs | 2 +-
FlexJobApi.Core/FlexJobApi.Core.xml | 15 +++++++++++++++
FlexJobApi.User.Application/Menus/Queries/GetMenuQueryHandler.cs | 1 +
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 5781243..ba3a216 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -2815,16 +2815,31 @@
浼佷笟璁よ瘉
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.ProvinceId">
+ <summary>
+ 鎵�鍦ㄧ渷浠絀d
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.ProvinceContent">
<summary>
鎵�鍦ㄧ渷浠�
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.CityId">
+ <summary>
+ 鎵�鍦ㄥ煄甯侷d
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.CityContent">
<summary>
鎵�鍦ㄥ煄甯�
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.IndustryTypeId">
+ <summary>
+ 鎵�灞炶涓欼d
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.IndustryTypeContent">
<summary>
鎵�灞炶涓�
diff --git a/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenuQueryHandler.cs b/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenuQueryHandler.cs
index d541762..6229aa5 100644
--- a/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenuQueryHandler.cs
+++ b/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenuQueryHandler.cs
@@ -35,6 +35,7 @@
.FirstOrDefaultAsync(cancellationToken);
if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヨ彍鍗�");
var q = repMenu.AsQueryable().AsNoTracking()
+ .OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime)
.Where(it => it.ParentId == model.Id)
.Where(it => it.Type == EnumMenuType.Button || it.Type == EnumMenuType.Field);
if (logier.Level != 999)
diff --git a/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenusQueryHandler.cs b/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenusQueryHandler.cs
index 4176b12..0243da5 100644
--- a/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenusQueryHandler.cs
+++ b/FlexJobApi.User.Application/Auths/Queries/GetCurrentLogierMenusQueryHandler.cs
@@ -32,7 +32,7 @@
{
var logier = JwtUtils.GetCurrentLogier();
var q = repMenu.AsQueryable().AsNoTracking()
- .OrderBy(it => it.Sort)
+ .OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime)
.Where(it => it.UserType == logier.Type && it.ClientType == logier.ClientType)
.Where(it => it.Type == EnumMenuType.Menu || it.Type == EnumMenuType.Page || it.Type == EnumMenuType.Modal);
if (logier.Level != 999)
diff --git a/FlexJobApi.User.Application/Menus/Queries/GetMenuQueryHandler.cs b/FlexJobApi.User.Application/Menus/Queries/GetMenuQueryHandler.cs
index 90b739b..7628ee9 100644
--- a/FlexJobApi.User.Application/Menus/Queries/GetMenuQueryHandler.cs
+++ b/FlexJobApi.User.Application/Menus/Queries/GetMenuQueryHandler.cs
@@ -35,6 +35,7 @@
: [];
model.IsChecked = roleMenuIds.Contains(model.Id);
var items = await rep.AsQueryable().AsNoTracking()
+ .OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime)
.Where(it => it.ParentId == model.Id)
.Where(it => it.Type == EnumMenuType.Button || it.Type == EnumMenuType.Field)
.ProjectToType<GetMenuQueryResultItem>()
diff --git a/FlexJobApi.User.Application/Menus/Queries/GetMenusQueryHandler.cs b/FlexJobApi.User.Application/Menus/Queries/GetMenusQueryHandler.cs
index c19d457..b5c4240 100644
--- a/FlexJobApi.User.Application/Menus/Queries/GetMenusQueryHandler.cs
+++ b/FlexJobApi.User.Application/Menus/Queries/GetMenusQueryHandler.cs
@@ -24,7 +24,7 @@
public async Task<List<GetMenusQueryResultItem>> Handle(GetMenusQuery request, CancellationToken cancellationToken)
{
var q = rep.AsQueryable().AsNoTracking()
- .OrderBy(it => it.Sort)
+ .OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime)
.Where(it => it.UserType == request.UserType && it.ClientType == request.ClientType)
.Where(it => it.Type == EnumMenuType.Menu || it.Type == EnumMenuType.Page || it.Type == EnumMenuType.Modal);
var all = await q.ProjectToType<GetMenusQueryResultItem>().ToListAsync();
--
Gitblit v1.9.1