From c705036e329e3fe56e72ea9993ec52900b1da213 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 12 Jul 2023 14:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90system=E3=80=91?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/sys/api/pojo/user/SimpleUserDTO.java       | 6 ++++++
 .../sys/modular/user/service/impl/SysUserServiceImpl.java   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/SimpleUserDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/SimpleUserDTO.java
index 2207eaad0..8a714fe8d 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/SimpleUserDTO.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/SimpleUserDTO.java
@@ -42,6 +42,12 @@ public class SimpleUserDTO {
     @ChineseDescription("主键")
     private Long userId;
 
+    /**
+     * 账号
+     */
+    @ChineseDescription("账号")
+    private String account;
+
     /**
      * 姓名
      */
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 5cd4c60d2..ec87c50e4 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
@@ -324,7 +324,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
         sysUserLambdaQueryWrapper.eq(SysUser::getUserId, userId);
-        sysUserLambdaQueryWrapper.select(SysUser::getRealName, SysUser::getAvatar);
+        sysUserLambdaQueryWrapper.select(SysUser::getRealName, SysUser::getAvatar, SysUser::getAccount);
         SysUser sysUser = this.getOne(sysUserLambdaQueryWrapper);
         if (sysUser == null) {
             return null;
@@ -333,6 +333,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SimpleUserDTO simpleUserDTO = new SimpleUserDTO();
         simpleUserDTO.setUserId(userId);
         simpleUserDTO.setRealName(sysUser.getRealName());
+        simpleUserDTO.setAccount(sysUser.getAccount());
 
         // 获取头像文件id信息,转化为头像URL
         Long avatarFileId = sysUser.getAvatar();