diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java index d2ed5e45..ce1f6005 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java @@ -144,6 +144,8 @@ public class UserVo { private Date createdAt; @ApiModelProperty("空间使用情况") private Interspace interspace; + @ApiModelProperty("WxInfo") + private WxInfo wxInfo; @ApiModelProperty("标签信息") private List labelList; } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java index 344526b9..c6b688e7 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java @@ -61,4 +61,11 @@ public interface SysUserDao extends SysUserMapper { * @return */ UserVo.TokenBean getTokenBeanByUserId(Long userId); + + /** + * 查找用户wxInfo中的信息 + * @param currentUserId 当前用户id + * @return UserVo.WxInfo + */ + UserVo.WxInfo selectWxInfo(@Param("userId") Long currentUserId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java index 61855606..1cd54e20 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java @@ -195,6 +195,9 @@ public class UserInfoService implements IUserInfoService{ //获取空间使用信息 UserVo.Interspace interspace = sysUserDao.selectInterspace(currentUserId); selectUserInfo.setInterspace(interspace); + //封装wxInfo + UserVo.WxInfo wxInfo = sysUserDao.selectWxInfo(currentUserId); + selectUserInfo.setWxInfo(wxInfo); } return selectUserInfo; diff --git a/tall/src/main/resources/mapper_dao/SysUserDao.xml b/tall/src/main/resources/mapper_dao/SysUserDao.xml index d917ade3..c884fb86 100644 --- a/tall/src/main/resources/mapper_dao/SysUserDao.xml +++ b/tall/src/main/resources/mapper_dao/SysUserDao.xml @@ -198,4 +198,19 @@ AND rec_status = 0 + + \ No newline at end of file