userId

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatTemplateServiceImpl.java

@@ -273,12 +273,22 @@ public class SweetWechatTemplateServiceImpl {
             // 同步手机号
             String oldAdamUserId = sweetWechatUser.getAdamUserId();
             String oldAdamPhone = sweetWechatUser.getAdamPhone();
-            if ((!phone.isEmpty() || !userId.isEmpty()) && ((null == oldAdamUserId || oldAdamUserId.isEmpty()) || null == oldAdamPhone || oldAdamPhone.isEmpty())) {
+            if (null == oldAdamUserId) {
+                oldAdamUserId = "";
+            }
+            if (null == oldAdamPhone) {
+                oldAdamPhone = "";
+            }
+            if ((!phone.isEmpty() || !userId.isEmpty()) && (oldAdamUserId.isEmpty() || oldAdamPhone.isEmpty())) {
                 if (!phone.isEmpty()) {
                     sweetWechatUser.setAdamPhone(phone);
+                } else {
+                    sweetWechatUser.setAdamPhone(oldAdamPhone);
                 }
                 if (!userId.isEmpty()) {
                     sweetWechatUser.setAdamUserId(userId);
+                } else {
+                    sweetWechatUser.setAdamUserId(oldAdamUserId);
                 }
                 if (null == type || type <= 1) {
                     redisDataUtils.setSweetWechatUser(sweetWechatUser);