diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java index 1842b4ba7..a74a4cd7b 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java @@ -7,6 +7,7 @@ import cn.stylefeng.roses.kernel.rule.annotation.EnumFieldFormat; import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat; import cn.stylefeng.roses.kernel.rule.enums.SexEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; +import cn.stylefeng.roses.kernel.rule.util.sort.GetSortKey; import cn.stylefeng.roses.kernel.sys.api.enums.user.UserStatusEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.user.UserOrgDTO; import cn.stylefeng.roses.kernel.sys.modular.user.pojo.response.SysUserCertificateResponse; @@ -27,7 +28,7 @@ import java.util.List; @TableName(value = "sys_user", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) -public class SysUser extends BaseExpandFieldEntity { +public class SysUser extends BaseExpandFieldEntity implements GetSortKey { /** * 主键 @@ -220,4 +221,9 @@ public class SysUser extends BaseExpandFieldEntity { @ChineseDescription("用户证书列表") private List userCertificateList; + @Override + public Object getSortKey() { + return userId; + } + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java index ca428685a..64302ad79 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -24,6 +24,7 @@ import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; +import cn.stylefeng.roses.kernel.rule.util.SortUtils; import cn.stylefeng.roses.kernel.sys.api.SecurityConfigService; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveUserCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; @@ -403,7 +404,10 @@ public class SysUserServiceImpl extends ServiceImpl impl return dictList; } - for (SysUser sysUser : list) { + // 排序 + List sortUsers = SortUtils.sortListByObjectKey(list, new LinkedList<>(sysUserRequest.getUserIdList())); + + for (SysUser sysUser : sortUsers) { dictList.add(new SimpleDict(sysUser.getUserId(), sysUser.getRealName(), null)); }