diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseUser.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseUser.java index 037cd476..0ad16758 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseUser.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseUser.java @@ -79,6 +79,11 @@ public class EnterpriseUser extends TenantEntity { */ private String password; + /** + * 深i企用户ID + */ + private String siqUserId; + /** * 账号状态(0正常 1停用) */ 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 5d59f4ae..36347461 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 @@ -201,7 +201,9 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService private EnterpriseUser saveOrUpdateEnterpriseUser(JSONObject userInfo) { String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone")); String account = userInfo.getString("account"); + String siqUserId = userInfo.getString("userId"); String loginName = StringUtils.isNotEmpty(account) ? account : phone; + loginName = StringUtils.isNotEmpty(loginName) ? loginName : siqUserId; String userType = UserType.APP_USER.getUserType(); EnterpriseUser newUser = null; if (StringUtils.isEmpty(loginName)) { @@ -247,6 +249,7 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService user.setLoginName(loginName); user.setPhonenumber(phone); user.setNickName(userInfo.getString("userName")); + user.setSiqUserId(userInfo.getString("userId")); // 设置默认部门ID user.setDeptId(UserConstants.DEFAULT_DEPT);