From 927f2685714e4933b000b64d2045078a68795792 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 27 Aug 2024 20:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=99=BB=E5=90=8D=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E7=94=A8=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zdxt/code/service/impl/ThirdLoginServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
index 5ee21197..89b6137d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
+++ b/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();