|
@@ -1250,8 +1250,25 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
if (StringUtils.isNotBlank(hpUserOld.getUnionid())) {
|
|
if (StringUtils.isNotBlank(hpUserOld.getUnionid())) {
|
|
|
- hpUserOld.setId(hpUserOth.getId());
|
|
|
|
|
- return hpUserOld;
|
|
|
|
|
|
|
+ hpUserOth.setUnionid(hpUserOld.getUnionid());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StringUtils.isNotBlank(hpUserOld.getWxOpenid())) {
|
|
|
|
|
+ hpUserOth.setWxOpenid(hpUserOld.getWxOpenid());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StringUtils.isNotBlank(hpUserOld.getMinaOpenid())) {
|
|
|
|
|
+ hpUserOth.setMinaOpenid(hpUserOld.getMinaOpenid());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StringUtils.isNotBlank(hpUserOld.getMinaSessionKey())) {
|
|
|
|
|
+ hpUserOth.setMinaSessionKey(hpUserOld.getMinaSessionKey());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StringUtils.isNotBlank(hpUserOld.getAccessToken())) {
|
|
|
|
|
+ hpUserOth.setAccessToken(hpUserOld.getAccessToken());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (hpUserOld.getAccessTokenEndtime() != null) {
|
|
|
|
|
+ hpUserOth.setAccessTokenEndtime(hpUserOld.getAccessTokenEndtime());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StringUtils.isNotBlank(hpUserOld.getRefreshToken())) {
|
|
|
|
|
+ hpUserOth.setRefreshToken(hpUserOld.getRefreshToken());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return hpUserOth;
|
|
return hpUserOth;
|