diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs index 0fd1154a..9c497a98 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs @@ -3,6 +3,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Post public class PostUpdateInputVo { public bool? State { get; set; } + public int OrderNum { get; set; } public string PostCode { get; set; } public string PostName { get; set; } public string? Remark { get; set; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs index 3cf0fe9c..1975ed9d 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs @@ -30,6 +30,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var entities = await _repository._DbQueryable.WhereIF(!string.IsNullOrEmpty(input.PostName), x => x.PostName.Contains(input.PostName!)) .WhereIF(input.State is not null, x => x.State == input.State) + .OrderByDescending(x => x.OrderNum) .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); return new PagedResultDto(total, await MapToGetListOutputDtosAsync(entities)); } diff --git a/Yi.RuoYi.Vue3/src/assets/styles/index.scss b/Yi.RuoYi.Vue3/src/assets/styles/index.scss index 29dd2b9e..37d403eb 100644 --- a/Yi.RuoYi.Vue3/src/assets/styles/index.scss +++ b/Yi.RuoYi.Vue3/src/assets/styles/index.scss @@ -133,6 +133,11 @@ aside { .pagination-container { margin-top: 30px; + + .el-pagination{ + right:20px; + position: absolute; + } } .text-center { diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue index 6bf1d72b..ec513e78 100644 --- a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue +++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue @@ -1,38 +1,234 @@