用户登录没有登名的情况下用手机号

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -83,10 +83,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //本系统令牌
 //            UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false);
             UserToken sysToken = null;
-            if (null != user && StringUtils.isEmpty(user.getLoginName())) {
+            if (null != user && StringUtils.isNotEmpty(user.getLoginName())) {
                 sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD);
             }
-            if (null != user || StringUtils.isEmpty(user.getPhonenumber())) {
+            if (null == sysToken && null != user && StringUtils.isNotEmpty(user.getPhonenumber())) {
                 sysToken = new UserToken(user.getPhonenumber(), LoginType.NOPASSWD);
             }
             Subject subject = SecurityUtils.getSubject();