Browse Source

Merge pull request 'fix:用户中心问题修复' (#74) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-backend/pulls/74
master
xiaojinfei 1 week ago
parent
commit
ce80afd1b0
  1. 6
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java

@ -68,8 +68,12 @@ public class UserProfileController {
// 获得岗位信息 // 获得岗位信息
List<PostDO> posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null; List<PostDO> posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null;
// 获得社交用户信息 // 获得社交用户信息
List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue()); // List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue());
List<SocialUserDO> socialUsers = null;
// return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers));
return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers)); return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers));
} }
@PutMapping("/update") @PutMapping("/update")

Loading…
Cancel
Save