|
@ -289,8 +289,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
UserDTO userDTO = userWechatDao.selectUserDTOByOpenId(dto); |
|
|
UserDTO userDTO = userWechatDao.selectUserDTOByOpenId(dto); |
|
|
|
|
|
|
|
|
UserWechatEntity userWechatEntity = ConvertUtils.sourceToTarget(wechatDTO, UserWechatEntity.class); |
|
|
UserWechatEntity userWechatEntity = ConvertUtils.sourceToTarget(wechatDTO, UserWechatEntity.class); |
|
|
if ("".equals(userWechatEntity.getUnionId())) { |
|
|
if ("".equals(userWechatEntity.getWxUnionId())) { |
|
|
userWechatEntity.setUnionId(null); |
|
|
userWechatEntity.setWxUnionId(null); |
|
|
} |
|
|
} |
|
|
//2.不存在则新增,存在则更新
|
|
|
//2.不存在则新增,存在则更新
|
|
|
if (null == userDTO || null == userDTO.getId()) { |
|
|
if (null == userDTO || null == userDTO.getId()) { |
|
|