|
|
@@ -105,6 +105,9 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
|
|
|
var user = baseMapper.selectOne(new QueryWrapper<User>().eq("openid", openid));
|
|
|
if (user != null) {
|
|
|
// 登录逻辑
|
|
|
+ if(CommUtil.isNotEmptyAndNull(unionid) && CommUtil.isEmptyOrNull(user.getUnionid())){
|
|
|
+ user.setUnionid(unionid);
|
|
|
+ }
|
|
|
return handleLogin(user);
|
|
|
} else {
|
|
|
// 注册逻辑
|
|
|
@@ -182,6 +185,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
|
|
|
StpUtil.login(user.getId());
|
|
|
// 用户名存入session,统一日志读取使用
|
|
|
StpUtil.getSession().set("openid", user.getOpenid());
|
|
|
+ StpUtil.getSession().set("unionid", user.getUnionid());
|
|
|
StpUtil.getSession().set("userId", user.getId());
|
|
|
StpUtil.getSession().set("username", user.getUsername());
|
|
|
StpUtil.getSession().set("mobilePhone", user.getMobilePhone());
|