修改回去手机号

src/main/java/cn/quantgroup/xyqb/entity/User.java

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.entity.converter.EncryptConverter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.apache.commons.lang.StringUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -44,13 +45,13 @@ public class User extends BaseEntity implements Serializable {
     @Convert(converter = EncryptConverter.class)
     private String encryptedPhoneNo;
 
-    public String getEnctyptedPhoneNo() {
-        return encryptedPhoneNo == null ? phoneNo : encryptedPhoneNo;
-    }
-
-    public String getPhoneNo() {
-        return this.getEncryptedPhoneNo();
-    }
+//    public String getEnctyptedPhoneNo() {
+//        return StringUtils.isBlank(encryptedPhoneNo) ? phoneNo : encryptedPhoneNo;
+//    }
+//
+//    public String getPhoneNo() {
+//        return getEncryptedPhoneNo();
+//    }
 
     /**
      * 是否有密码

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -113,6 +113,9 @@ public class UserServiceImpl implements IUserService, IBaseController {
         if (user == null) {
             user = userRepository.findByPhoneNo(phone);
         }
+        if (StringUtils.isBlank(user.getEncryptedPhoneNo())) {
+            user.setEncryptedPhoneNo(user.getPhoneNo());
+        }
         return user;
     }
 
@@ -192,6 +195,9 @@ public class UserServiceImpl implements IUserService, IBaseController {
         if (user == null) {
             user = userRepository.findByPhoneNo(phone);
         }
+        if (StringUtils.isBlank(user.getEncryptedPhoneNo())) {
+            user.setEncryptedPhoneNo(user.getPhoneNo());
+        }
         return user;
     }