diff --git a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java index 58437ea0..3c7a4d16 100644 --- a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java +++ b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java @@ -34,7 +34,7 @@ public class UserWechatEntity extends BaseEpmetEntity { /** * 微信unionId */ - private String unionId; + private String wxUnionId; /** * 手机号 diff --git a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 1669ffbf..800fdab0 100644 --- a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -289,8 +289,8 @@ public class UserServiceImpl extends BaseServiceImpl implem UserDTO userDTO = userWechatDao.selectUserDTOByOpenId(dto); UserWechatEntity userWechatEntity = ConvertUtils.sourceToTarget(wechatDTO, UserWechatEntity.class); - if ("".equals(userWechatEntity.getUnionId())) { - userWechatEntity.setUnionId(null); + if ("".equals(userWechatEntity.getWxUnionId())) { + userWechatEntity.setWxUnionId(null); } //2.不存在则新增,存在则更新 if (null == userDTO || null == userDTO.getId()) {