|
|
@@ -1680,12 +1680,8 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
} else {
|
|
|
hpUser = hpUserList.get(0);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getWxOpenid())) {
|
|
|
- hpUser.setWxOpenid(openId);
|
|
|
- }
|
|
|
- if (StringUtils.isBlank(hpUser.getUnionid())) {
|
|
|
- hpUser.setUnionid(unionId);
|
|
|
- }
|
|
|
+ hpUser.setWxOpenid(openId);
|
|
|
+ hpUser.setUnionid(unionId);
|
|
|
}
|
|
|
|
|
|
//如果登录方式不包含微信授权,则添加
|
|
|
@@ -2208,12 +2204,8 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
} else {
|
|
|
hpUser = hpUserList.get(0);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(hpUser.getMinaOpenid())) {
|
|
|
- hpUser.setMinaOpenid(openId);
|
|
|
- }
|
|
|
- if (StringUtils.isBlank(hpUser.getUnionid())) {
|
|
|
- hpUser.setUnionid(unionId);
|
|
|
- }
|
|
|
+ hpUser.setMinaOpenid(openId);
|
|
|
+ hpUser.setUnionid(unionId);
|
|
|
}
|
|
|
//如果登录方式不包含小程序授权,则添加
|
|
|
if (!hpUser.getLoginType().contains(AppLoginsEnum.MINA.getType())) {
|