From fbd8628b2636593a3b9485ba5a404697f0df9340 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 24 Feb 2024 16:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.1=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/sys/modular/user/entity/SysUser.java     | 8 +++++++-
 .../sys/modular/user/service/impl/SysUserServiceImpl.java | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

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<SysUserCertificateResponse> 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<SysUserMapper, SysUser> impl
             return dictList;
         }
 
-        for (SysUser sysUser : list) {
+        // 排序
+        List<SysUser> sortUsers = SortUtils.sortListByObjectKey(list, new LinkedList<>(sysUserRequest.getUserIdList()));
+
+        for (SysUser sysUser : sortUsers) {
             dictList.add(new SimpleDict(sysUser.getUserId(), sysUser.getRealName(), null));
         }