|
@@ -17,6 +17,7 @@ import org.dromara.common.web.core.BaseController;
|
|
|
import org.dromara.system.domain.bo.SysUserBo;
|
|
import org.dromara.system.domain.bo.SysUserBo;
|
|
|
import org.dromara.system.domain.bo.SysUserPasswordBo;
|
|
import org.dromara.system.domain.bo.SysUserPasswordBo;
|
|
|
import org.dromara.system.domain.bo.SysUserProfileBo;
|
|
import org.dromara.system.domain.bo.SysUserProfileBo;
|
|
|
|
|
+import org.dromara.system.domain.vo.ProfileUserVo;
|
|
|
import org.dromara.system.domain.vo.SysOssVo;
|
|
import org.dromara.system.domain.vo.SysOssVo;
|
|
|
import org.dromara.system.domain.vo.SysUserVo;
|
|
import org.dromara.system.domain.vo.SysUserVo;
|
|
|
import org.dromara.system.service.ISysOssService;
|
|
import org.dromara.system.service.ISysOssService;
|
|
@@ -50,7 +51,9 @@ public class SysProfileController extends BaseController {
|
|
|
SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
|
|
SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
|
|
|
String roleGroup = userService.selectUserRoleGroup(user.getUserId());
|
|
String roleGroup = userService.selectUserRoleGroup(user.getUserId());
|
|
|
String postGroup = userService.selectUserPostGroup(user.getUserId());
|
|
String postGroup = userService.selectUserPostGroup(user.getUserId());
|
|
|
- ProfileVo profileVo = new ProfileVo(user, roleGroup, postGroup);
|
|
|
|
|
|
|
+ // 单独做一个vo专门给个人中心用 避免数据被脱敏
|
|
|
|
|
+ ProfileUserVo profileUser = BeanUtil.toBean(user, ProfileUserVo.class);
|
|
|
|
|
+ ProfileVo profileVo = new ProfileVo(profileUser, roleGroup, postGroup);
|
|
|
return R.ok(profileVo);
|
|
return R.ok(profileVo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -128,6 +131,6 @@ public class SysProfileController extends BaseController {
|
|
|
|
|
|
|
|
public record AvatarVo(String imgUrl) {}
|
|
public record AvatarVo(String imgUrl) {}
|
|
|
|
|
|
|
|
- public record ProfileVo(SysUserVo user, String roleGroup, String postGroup) {}
|
|
|
|
|
|
|
+ public record ProfileVo(ProfileUserVo user, String roleGroup, String postGroup) {}
|
|
|
|
|
|
|
|
}
|
|
}
|