zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix-企业登录注册

Browse Source
This commit is contained in:
李顺东
2026-01-13 23:58:56 +08:00
parent f96f653e87
commit 12c4f91bec
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@@ -829,10 +829,10 @@ public class SysLoginService
if (appUser != null) { if (appUser != null) {
// 用户存在 // 用户存在
if (StringUtils.isBlank(appUser.getYtjPassword())) { if (StringUtils.isBlank(appUser.getYtjPassword())) {
// 密码为空，设置密码并登录 // 密码为空，设置密码并登录（注意：updateAppUser会自动加密密码）
AppUser updateParam = new AppUser(); AppUser updateParam = new AppUser();
updateParam.setUserId(appUser.getUserId()); updateParam.setUserId(appUser.getUserId());
updateParam.setYtjPassword(SiteSecurityUtils.encryptPassword(password)); updateParam.setYtjPassword(password); // 传明文，updateAppUser会加密
updateParam.setLoginDate(new Date()); updateParam.setLoginDate(new Date());
// 如果传了企业信息，也更新 // 如果传了企业信息，也更新
if (StringUtils.isNotBlank(companyCode)) { if (StringUtils.isNotBlank(companyCode)) {
@@ -842,7 +842,8 @@ public class SysLoginService
updateParam.setName(companyName); updateParam.setName(companyName);
} }
appUserService.updateAppUser(updateParam); appUserService.updateAppUser(updateParam);
appUser.setYtjPassword(updateParam.getYtjPassword()); // 重新查询获取加密后的密码
appUser = appUserService.getPhoneAndUserType(phone, StringUtil.IS_COMPANY_USER);
} else { } else {
// 密码已设置，校验密码 // 密码已设置，校验密码
if (!SiteSecurityUtils.matchesPassword(password, appUser.getYtjPassword())) { if (!SiteSecurityUtils.matchesPassword(password, appUser.getYtjPassword())) {