Merge branch 'refs/heads/pr_74' into abp

# Conflicts:
#	Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/DictionaryService.cs

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Dictionary/DictionaryCreateInputVo.cs

@@ -5,6 +5,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Dictionary
     /// </summary>
     public class DictionaryCreateInputVo
     {
+        public int OrderNum { get; set; }
         public string? Remark { get; set; }
         public string? ListClass { get; set; }
         public string? CssClass { get; set; }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Dictionary/DictionaryGetListOutputDto.cs

@@ -4,6 +4,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Dictionary
 {
     public class DictionaryGetListOutputDto : EntityDto<Guid>
     {
+        public int OrderNum { get; set; }
         public DateTime CreationTime { get; set; } = DateTime.Now;
         public Guid? CreatorId { get; set; }
         public string? Remark { get; set; }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Dictionary/DictionaryGetOutputDto.cs

@@ -4,6 +4,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Dictionary
 {
     public class DictionaryGetOutputDto : EntityDto<Guid>
     {
+        public int OrderNum { get; set; }
         public DateTime CreationTime { get; set; } = DateTime.Now;
         public Guid? CreatorId { get; set; }
         public string? Remark { get; set; }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Dictionary/DictionaryUpdateInputVo.cs

@@ -2,6 +2,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Dictionary
 {
     public class DictionaryUpdateInputVo
     {
+        public int OrderNum { get; set; }
         public string? Remark { get; set; }
         public string? ListClass { get; set; }
         public string? CssClass { get; set; }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/DictionaryService.cs

@@ -6,7 +6,6 @@ using Yi.Framework.Ddd.Application;
 using Yi.Framework.Rbac.Application.Contracts.Dtos.Dictionary;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Entities;
-using Yi.Framework.Rbac.Domain.Shared.Consts;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
 
@@ -15,29 +14,27 @@ namespace Yi.Framework.Rbac.Application.Services
     /// <summary>
     /// Dictionary服务实现
     /// </summary>
-    public class DictionaryService : YiCrudAppService<DictionaryEntity, DictionaryGetOutputDto,
+    public class DictionaryService : YiCrudAppService<DictionaryEntity, DictionaryGetOutputDto, DictionaryGetListOutputDto, Guid, DictionaryGetListInputVo, DictionaryCreateInputVo, DictionaryUpdateInputVo>,
-            DictionaryGetListOutputDto, Guid, DictionaryGetListInputVo, DictionaryCreateInputVo,
+       IDictionaryService
-            DictionaryUpdateInputVo>,
-        IDictionaryService
     {
         private ISqlSugarRepository<DictionaryEntity, Guid> _repository;
-
         public DictionaryService(ISqlSugarRepository<DictionaryEntity, Guid> repository) : base(repository)
         {
-            _repository = repository;
+            _repository= repository;
         }
 
         /// <summary>
         /// 查询
         /// </summary>
-        public override async Task<PagedResultDto<DictionaryGetListOutputDto>> GetListAsync(
+
-            DictionaryGetListInputVo input)
+        public override async Task<PagedResultDto<DictionaryGetListOutputDto>> GetListAsync(DictionaryGetListInputVo input)
         {
             RefAsync<int> total = 0;
             var entities = await _repository._DbQueryable
                 .WhereIF(input.DictType is not null, x => x.DictType == input.DictType)
                 .WhereIF(input.DictLabel is not null, x => x.DictLabel!.Contains(input.DictLabel!))
                 .WhereIF(input.State is not null, x => x.State == input.State)
+                .OrderByDescending(x => x.OrderNum)
                 .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
             return new PagedResultDto<DictionaryGetListOutputDto>
             {
@@ -60,4 +57,4 @@ namespace Yi.Framework.Rbac.Application.Services
             return result;
         }
     }
-}
+}