From 433f8af9daee1d652038bee35fb4562c5963f5e0 Mon Sep 17 00:00:00 2001
From: Bill <771989711@qq.com>
Date: Wed, 1 Nov 2023 08:34:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8Dbug=E3=80=91?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=85=E6=B0=91=E7=AB=AF=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=201.=E4=BF=AE=E6=AD=A3=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=20"unionId"=20=3D>=20"wxUnionId"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/entity/UserWechatEntity.java      | 2 +-
 .../src/main/java/com/epmet/service/impl/UserServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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<UserDao, UserEntity> 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()) {