From 12c4f91bec055c6b17a63d6b9390b4233a3c10e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=A1=BA=E4=B8=9C?= <577732344@qq.com>
Date: Tue, 13 Jan 2026 23:58:56 +0800
Subject: [PATCH] =?UTF-8?q?bugfix-=E4=BC=81=E4=B8=9A=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/framework/web/service/SysLoginService.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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