调整登录限制

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -464,7 +464,18 @@ public class AppLoginController extends AppBaseController{
         if (!redisCode.equals(code)) {
             return R.error("验证码错误");
         }
+
         updateExistingUserJpushId(user.get(0), map.get("jpushId"));
+        if (user.get(0).getUnionId()==null){
+            if (user.get(0).getPhone().length()<=11){
+                FsUser fsUser = new FsUser();
+                fsUser.setUserId(user.get(0).getUserId());
+                fsUser.setPhone(encryptPhone(phone));
+                userMapper.updateFsUser(fsUser);
+                logger.info("zyp \n【手机加密】：{}",encryptPhone(phone));
+            }
+            return R.ok().put("isNew",true).put("phone",encryptPhone(phone));
+        }
         return generateTokenAndReturn(user.get(0));
     }
 
@@ -692,6 +703,16 @@ public class AppLoginController extends AppBaseController{
         //当前手机号只绑定了单个微信，直接登录
         if (usersByPhone.size()==1){
             user = usersByPhone.get(0);
+            if (user.getUnionId()==null){
+                if (user.getPhone().length()<=11){
+                    FsUser fsUser = new FsUser();
+                    fsUser.setUserId(user.getUserId());
+                    fsUser.setPhone(encryptPhone(param.getPhone()));
+                    userMapper.updateFsUser(fsUser);
+                    logger.info("zyp \n【手机加密】：{}",encryptPhone(param.getPhone()));
+                }
+                return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
+            }
             // 校验用户是否存在及账号状态
             if (user == null) {
                 return R.error("账号不存在，请先注册账号");