From ddb2acf37af9ad344dc0f64f71e19b8594ed9fa5 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Sun, 11 Jan 2026 18:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BD=93=E6=9C=BA?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/SysLoginService.java          | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 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 22787cb..1cdb1ff 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
@@ -674,11 +674,9 @@ public class SysLoginService
     public AjaxResult phoneLogin(LoginBody loginBody){
         //AppUser appUser=appUserService.getPhone(loginBody.getUsername());
         AppUser appUser=appUserService.getYtjValidPhone(loginBody.getUsername());
-        if(appUser==null){
-            return AjaxResult.error("未查询到您的注册信息，请先完成注册后再登录～");
-        }
-        if(!SiteSecurityUtils.matchesPassword(loginBody.getPassword(),appUser.getYtjPassword())){
-            return AjaxResult.error("您输入的密码有误，请核对后重新尝试～!");
+        AjaxResult ajaxResult=validPhoneLogin(loginBody.getPassword(),appUser);
+        if(!ajaxResult.isSuccess()){
+            return ajaxResult;
         }
         return getAjax(appUser);
     }
@@ -710,4 +708,27 @@ public class SysLoginService
         ajax.put("isCompanyUser",appUser.getIsCompanyUser());
         return ajax;
     }
+
+    /**
+     * 手机验证登录
+     * @param password
+     * @param appUser
+     * @return
+     */
+    public static AjaxResult validPhoneLogin(String password,AppUser appUser){
+        if(appUser==null){
+            return AjaxResult.error("未查询到您的注册信息，请先完成注册后再登录～");
+        }
+        if(StringUtils.isBlank(appUser.getYtjPassword())){
+            return AjaxResult.error("一体机密码为空，请维护后再进行登录～!");
+        }
+        try {
+            if (!SiteSecurityUtils.matchesPassword(password, appUser.getYtjPassword())) {
+                return AjaxResult.error("您输入的密码有误，请核对后重新尝试～");
+            }
+        } catch (Exception e) {
+            return AjaxResult.error("密码校验失败，请稍后重试～");
+        }
+        return AjaxResult.success("验证成功!");
+    }
 }