From de21423c9e1dfe63ac8bb15f2d441a5c2eac99c5 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 11 Sep 2026 16:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=B1i=E4=BC=81=E7=99=BB=E5=BD=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=85=BC=E5=AE=B9=E8=B4=A6=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/impl/AppEnterpriseLoginServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java index 579bcd62..13c35509 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java @@ -205,11 +205,13 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService * @return 是否操作成功 */ private EnterpriseUser saveOrUpdateEnterpriseUser(JSONObject userInfo) { - String loginName = userInfo.getString("account"); + String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone")); + String account = userInfo.getString("account"); + String loginName = StringUtils.isNotEmpty(account) ? account : phone; String userType = UserType.APP_USER.getUserType(); EnterpriseUser newUser = null; if (StringUtils.isEmpty(loginName)) { - log.error("深i企用户账号为空"); + log.error("深i企用户账号和手机号均为空"); throw new BaseException("深i企用户账号不能为空"); } @@ -244,10 +246,12 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService private EnterpriseUser buildEnterpriseUser(JSONObject userInfo, String userType) { EnterpriseUser user = new EnterpriseUser(); String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone")); + String account = userInfo.getString("account"); + String loginName = StringUtils.isNotEmpty(account) ? account : phone; // 基本信息 user.setUserName(userInfo.getString("userName")); user.setUserType(userType); - user.setLoginName(userInfo.getString("account")); + user.setLoginName(loginName); user.setPhonenumber(phone); user.setNickName(userInfo.getString("userName"));