【7.6.0】【sys】【user】完善获取用户详情

kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java

@@ -73,4 +73,12 @@ public interface SysUserServiceApi {
      */
     List<Long> getOrgUserIdList(Long orgId, Boolean containSubOrgFlag);
 
+    /**
+     * 获取用户的角色id列表
+     *
+     * @author fengshuonan
+     * @since 2023/6/12 11:29
+     */
+    List<Long> getUserRoleIdList(Long userId);
+
 }

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java

@@ -36,4 +36,9 @@ public class UserIntegrationService implements SysUserServiceApi {
         return null;
     }
 
+    @Override
+    public List<Long> getUserRoleIdList(Long userId) {
+        return null;
+    }
+
 }

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java

@@ -14,6 +14,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 系统用户实例类
@@ -158,10 +159,30 @@ public class SysUser extends BaseExpandFieldEntity {
     //-------------------------------非实体字段-------------------------------
 
     /**
-     * 用户组织机构详情
+     * 用户组织机构详情【只返回主部门】
+     * <p>
+     * 用在用户分页列表的响应
      */
     @TableField(exist = false)
-    @ChineseDescription("用户组织机构详情")
+    @ChineseDescription("用户组织机构详情【只返回主部门】")
     private UserOrgDTO userOrgDTO;
 
+    /**
+     * 用户组织机构详情【所有部门都显示】
+     * <p>
+     * 用在获取用户详情信息的响应
+     */
+    @TableField(exist = false)
+    @ChineseDescription("用户组织机构详情【所有部门都显示】")
+    private List<UserOrgDTO> userOrgDTOList;
+
+    /**
+     * 获取用户角色id列表
+     * <p>
+     * 用在获取用户详情信息的响应
+     */
+    @TableField(exist = false)
+    @ChineseDescription("获取用户角色id列表")
+    private List<Long> roleIdList;
+
 }

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -15,6 +15,7 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi;
 import cn.stylefeng.roses.kernel.sys.api.callback.RemoveUserCallbackApi;
 import cn.stylefeng.roses.kernel.sys.api.enums.UserStatusEnum;
+import cn.stylefeng.roses.kernel.sys.api.pojo.UserOrgDTO;
 import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUser;
 import cn.stylefeng.roses.kernel.sys.modular.user.enums.SysUserExceptionEnum;
 import cn.stylefeng.roses.kernel.sys.modular.user.mapper.SysUserMapper;
@@ -118,7 +119,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public SysUser detail(SysUserRequest sysUserRequest) {
-        return this.querySysUser(sysUserRequest);
+        SysUser sysUser = this.querySysUser(sysUserRequest);
+
+        // 获取用户的组织机构信息
+        List<UserOrgDTO> userOrgList = sysUserServiceApi.getUserOrgList(sysUser.getUserId());
+        sysUser.setUserOrgDTOList(userOrgList);
+
+        // 获取用户的角色信息
+        List<Long> userRoleIdList = sysUserServiceApi.getUserRoleIdList(sysUser.getUserId());
+        sysUser.setRoleIdList(userRoleIdList);
+
+        return sysUser;
     }
 
     @Override