diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index 9206aa5b..f995f012 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -240,7 +240,9 @@ public sealed class UserService( .Count(out var total) .ToListAsync(listUserExp) .ConfigureAwait(false); - return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); + return new PagedQueryRsp(req.Page, req.PageSize, total + , list.Select(x => x with { Roles = x.Roles.OrderBy(y => y.Sort).ThenBy(y => y.Id).ToList() }) + .Adapt>()); } /// diff --git a/src/frontend/admin/src/views/sys/user/index.vue b/src/frontend/admin/src/views/sys/user/index.vue index c3e3f181..3bfe006a 100644 --- a/src/frontend/admin/src/views/sys/user/index.vue +++ b/src/frontend/admin/src/views/sys/user/index.vue @@ -36,14 +36,6 @@ placeholder: $t('用户编号 / 用户名 / 手机号 / 邮箱 / 备注'), style: 'width:25rem', }, - { - type: 'remote-select', - field: ['filter', 'roleId'], - api: $API.sys_role.query, - config: { props: { label: 'name', value: 'id' } }, - placeholder: $t('所属角色'), - style: 'width:15rem', - }, { type: 'cascader', field: ['filter', 'deptId'], @@ -52,6 +44,14 @@ placeholder: $t('所属部门'), style: 'width:15rem', }, + { + type: 'remote-select', + field: ['filter', 'roleId'], + api: $API.sys_role.query, + config: { props: { label: 'name', value: 'id' } }, + placeholder: $t('所属角色'), + style: 'width:15rem', + }, ]" :vue="this" @reset="onReset" @@ -103,18 +103,18 @@ - - + + width="120" /> +