From 8483250a65412a7535f13da7c9defeb392b6b953 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Mon, 12 Jan 2026 11:45:12 +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=E2=80=94=E2=80=94=E5=85=88?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=B1=82=E8=81=8C=E8=80=85=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=B1=82=E8=81=8C=E8=80=85=E6=9F=A5=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=B1=E6=94=BE=E5=BC=80=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/service/impl/AppUserServiceImpl.java  | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
index 540e6c4..0221422 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
@@ -648,10 +648,36 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
 
     @Override
     public AppUser getYtjValidPhone(String phone) {
-        return appUserMapper.selectOne(new LambdaQueryWrapper<AppUser>()
-                .eq(AppUser::getPhone, phone).eq(AppUser::getDelFlag,"0")
+        return queryPhoneUser(phone);
+    }
+
+    /**
+     * 查询用户
+     * @param phone
+     * @return
+     */
+    public AppUser queryPhoneUser(String phone) {
+        AppUser user = appUserMapper.selectOne(buildBaseQuery(phone)
                 .isNotNull(AppUser::getIsCompanyUser)
-                .eq(AppUser::getIsCompanyUser, "1")
-                .orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
+                .eq(AppUser::getIsCompanyUser, "1"));
+
+        if (user == null) {
+            user = appUserMapper.selectOne(buildBaseQuery(phone)
+                    .isNotNull(AppUser::getIsCompanyUser));
+        }
+        return user;
+    }
+
+    /**
+     * 基础查询条件
+     * @param phone
+     * @return
+     */
+    private LambdaQueryWrapper<AppUser> buildBaseQuery(String phone) {
+        return new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getPhone, phone)
+                .eq(AppUser::getDelFlag, "0")
+                .orderByDesc(AppUser::getUpdateTime)
+                .last("LIMIT 1");
     }
 }