userId

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

@@ -280,16 +280,14 @@ public class SweetWechatTemplateServiceImpl {
                 oldAdamPhone = "";
             }
             if ((!phone.isEmpty() || !userId.isEmpty()) && (oldAdamUserId.isEmpty() || oldAdamPhone.isEmpty())) {
-                if (!phone.isEmpty()) {
-                    sweetWechatUser.setAdamPhone(phone);
-                } else {
-                    sweetWechatUser.setAdamPhone(oldAdamPhone);
+                if (phone.isEmpty()) {
+                    phone = oldAdamPhone;
                 }
-                if (!userId.isEmpty()) {
-                    sweetWechatUser.setAdamUserId(userId);
-                } else {
-                    sweetWechatUser.setAdamUserId(oldAdamUserId);
+                if (userId.isEmpty()) {
+                    userId = oldAdamUserId;
                 }
+                sweetWechatUser.setAdamPhone(phone);
+                sweetWechatUser.setAdamUserId(userId);
                 if (null == type || type <= 1) {
                     redisDataUtils.setSweetWechatUser(sweetWechatUser);
                 } else if (type == 2) {