😎所有排序字段增加Id组合

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -38,7 +38,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1054" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1055" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -34,7 +34,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
             {
                 u.NetType = (u.EffectType == "EnumSelector" || u.EffectType == "ConstSelector" ? u.DictTypeCode : u.NetType);
             })
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .ToListAsync();
     }
 

Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -157,6 +157,6 @@ public class SysDictTypeService : IDynamicApiController, ITransient
             .Where((u, a) => u.IsDelete == false && a.IsDelete == false && a.Status == StatusEnum.Enable)
             .Select((u, a) => new { TypeCode = u.Code, a.Code, a.Name, a.Value, a.Remark, a.OrderNo, a.TagType, a.ExtData })
             .ToListAsync();
-        return ds.OrderBy(u => u.OrderNo).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);
+        return ds.OrderBy(u => new { u.OrderNo, u.Code }).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);
     }
 }

Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -89,13 +89,13 @@ public class SysMenuService : IDynamicApiController, ITransient
                 .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title))
                 .WhereIF(input.Type is > 0, u => u.Type == input.Type)
                 .WhereIF(menuIdList.Count > 1, u => menuIdList.Contains(u.Id))
-                .OrderBy(u => u.OrderNo).ToListAsync();
+                .OrderBy(u => new { u.OrderNo, u.Id }).ToListAsync();
         }
 
         return _userManager.SuperAdmin ?
-            await _sysMenuRep.AsQueryable().OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0) :
+            await _sysMenuRep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0) :
             await _sysMenuRep.AsQueryable()
-                .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); // 角色菜单授权时
+                .OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); // 角色菜单授权时
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -44,7 +44,7 @@ public class SysOrgService : IDynamicApiController, ITransient
         // 获取拥有的机构Id集合
         var userOrgIdList = await GetUserOrgIdList();
 
-        var iSugarQueryable = _sysOrgRep.AsQueryable().OrderBy(u => u.OrderNo);
+        var iSugarQueryable = _sysOrgRep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id });
 
         // 带条件筛选时返回列表数据
         if (!string.IsNullOrWhiteSpace(input.Name) || !string.IsNullOrWhiteSpace(input.Code) || !string.IsNullOrWhiteSpace(input.Type))

Admin.NET/Admin.NET.Core/Service/Plugin/SysPluginService.cs

@@ -32,7 +32,7 @@ public class SysPluginService : IDynamicApiController, ITransient
     {
         return await _sysPluginRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name))
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 

Admin.NET/Admin.NET.Core/Service/Pos/SysPosService.cs

@@ -42,7 +42,7 @@ public class SysPosService : IDynamicApiController, ITransient
             {
                 TenantName = b.Name
             }, true)
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -63,7 +63,7 @@ public class SysPosService : IDynamicApiController, ITransient
             {
                 TenantName = b.Name
             }, true)
-            .OrderBy(u => u.OrderNo).ToListAsync();
+            .OrderBy(u => new { u.OrderNo, u.Id }).ToListAsync();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Print/SysPrintService.cs

@@ -29,7 +29,7 @@ public class SysPrintService : IDynamicApiController, ITransient
     {
         return await _sysPrintRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name))
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 

Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs

@@ -65,7 +65,7 @@ public class SysRoleService : IDynamicApiController, ITransient
             {
                 TenantName = b.Name
             }, true)
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -82,7 +82,7 @@ public class SysRoleService : IDynamicApiController, ITransient
         return await _sysRoleRep.AsQueryable()
             .WhereIF(!_userManager.SuperAdmin, u => u.TenantId == _userManager.TenantId) // 若非超管，则只能操作本租户的角色
             .WhereIF(!_userManager.SuperAdmin && !_userManager.SysAdmin, u => u.CreateUserId == _userManager.UserId || roleIdList.Contains(u.Id)) // 若非超管且非系统管理员，则只显示自己创建和已拥有的角色
-            .OrderBy(u => u.OrderNo).Select<RoleOutput>().ToListAsync();
+            .OrderBy(u => new { u.OrderNo, u.Id }).Select<RoleOutput>().ToListAsync();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -66,7 +66,7 @@ public class SysTenantService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), (u, a) => a.Phone.Contains(input.Phone.Trim()))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name), (u, a, b) => b.Name.Contains(input.Name.Trim()))
             .Where(u => u.Id.ToString() != SqlSugarConst.MainConfigId) // 排除默认主库/主租户
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .Select((u, a, b) => new TenantOutput
             {
                 Id = u.Id,

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -72,7 +72,7 @@ public class SysUserService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))
             .WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.RealName.Contains(input.RealName))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone.Contains(input.Phone))
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Id })
             .Select((u, a, b) => new UserOutput
             {
                 OrgName = a.Name,