diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/system/converter/UserConverter.java index a51435ca..b187c9ec 100644 --- a/src/main/java/com/youlai/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/system/converter/UserConverter.java @@ -43,7 +43,7 @@ public interface UserConverter { SysUser toEntity(UserImportDTO vo); - UserProfileVO toProfileVO(SysUser entity); + UserProfileVO toProfileVO(UserBO bo); SysUser toEntity(UserProfileForm formData); } diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/system/mapper/SysUserMapper.java index e684dcd8..e222c3ad 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysUserMapper.java @@ -56,4 +56,12 @@ public interface SysUserMapper extends BaseMapper { */ @DataPermission(deptAlias = "u") List listExportUsers(UserPageQuery queryParams); + + /** + * 获取用户个人中心信息 + * + * @param userId 用户ID + * @return + */ + UserBO getUserProfile(Long userId); } diff --git a/src/main/java/com/youlai/system/model/vo/UserProfileVO.java b/src/main/java/com/youlai/system/model/vo/UserProfileVO.java index 492a58f9..448479a3 100644 --- a/src/main/java/com/youlai/system/model/vo/UserProfileVO.java +++ b/src/main/java/com/youlai/system/model/vo/UserProfileVO.java @@ -1,8 +1,11 @@ package com.youlai.system.model.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.Date; + /** * 个人中心用户信息 * @@ -34,5 +37,14 @@ public class UserProfileVO { @Schema(description = "邮箱") private String email; + @Schema(description = "部门名称") + private String deptName; + + @Schema(description = "角色名称") + private String roleNames; + + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; } diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java index 81810992..3dea7517 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java @@ -248,7 +248,7 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public UserProfileVO getUserProfile(Long userId) { - SysUser entity = this.getById(userId); + UserBO entity = this.baseMapper.getUserProfile(userId); return userConverter.toProfileVO(entity); } diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index 7669c72c..c141984d 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -152,4 +152,26 @@ GROUP BY u.id + + +