From 8617a48bcba9686402e223a239d3d4b0dd0104bc Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 27 Aug 2024 22:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=B4=A6=E5=8F=B7=E7=9A=84=E6=83=85=E5=86=B5=E7=94=A8?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=81=9A=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zdxt/code/service/impl/ThirdLoginServiceImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 89b6137d..fb2983ee 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
@@ -76,7 +76,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             }
             if (null == user || StringUtils.isEmpty(user.getLoginName())) {
                 // 电话号码解密并获取用户
-                String phone = IdCardCryptoUtil.symmetricDecryptIdCard(srzSecretKey, jsonObject.getString("phone"));
+                String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, jsonObject.getString("phone"));
                 log.info("电话号码：{}",phone);
                 user = userApi.getUserByUserPhone(phone);
             }
@@ -145,9 +145,14 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //用户姓名
             userBean.setUserName(jsonObject.getString("userName"));
             //登录账号
-            userBean.setLoginName(jsonObject.getString("account"));
+            String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("phone"));
+            if (StringUtils.isNotEmpty(jsonObject.getString("account"))) {
+                userBean.setLoginName(jsonObject.getString("account"));
+            } else {
+                userBean.setLoginName(phone);
+            }
             //手机号码
-            userBean.setPhonenumber(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("phone")));
+            userBean.setPhonenumber(phone);
             //设置为默认密码
             userBean.setPassword("123456");
             userBean.setCreateTime(DateUtils.getNowDate());