|
@@ -131,6 +131,7 @@ public class UserController extends BaseApiController {
|
|
|
user.setSessionKey(sessionKey);
|
|
|
user.setUnionId(unionId);
|
|
|
user.setLoginDate(new Date());
|
|
|
+ user.setNickName(wxLoginParams.getNickName());
|
|
|
//如果用户头像字段为空,则默认获取用户微信头像
|
|
|
String avatarUrl = wxLoginParams.getAvatarUrl();
|
|
|
|
|
@@ -234,18 +235,19 @@ public class UserController extends BaseApiController {
|
|
|
@RequestMapping(value = "/user/getLoginUserinfo", method = RequestMethod.POST)
|
|
|
public AjaxResult getLoginUserinfo(@RequestBody JSONObject params) {
|
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
+ SysUser sysUser = sysUserService.selectUserById(SecurityUtils.getUserId());
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("userName", loginUser.getUsername());
|
|
|
- jsonObject.put("avatar", loginUser.getUser().getAvatar());
|
|
|
+ jsonObject.put("userName", sysUser.getUserName());
|
|
|
+ jsonObject.put("avatar", sysUser.getAvatar());
|
|
|
if(loginUser.getIdentity() == UserIdentityEnum.CHANNEL) {
|
|
|
Channel channel = channelService.getById(loginUser.getChannelId());
|
|
|
jsonObject.put("nickName", channel.getName());
|
|
|
} else {
|
|
|
- jsonObject.put("nickName", loginUser.getUser().getNickName());
|
|
|
+ jsonObject.put("nickName", sysUser.getNickName());
|
|
|
}
|
|
|
- jsonObject.put("openId", loginUser.getUser().getOpenId());
|
|
|
- jsonObject.put("channelOpenId", loginUser.getUser().getChannelOpenId());
|
|
|
+ jsonObject.put("openId", sysUser.getOpenId());
|
|
|
+ jsonObject.put("channelOpenId", sysUser.getChannelOpenId());
|
|
|
JSONArray roleKeys = new JSONArray();
|
|
|
JSONArray roles = new JSONArray();
|
|
|
loginUser.getUser().getRoles().forEach(sysRole -> roles.add(sysRole.getRoleName()));
|