From 74232f3f2a69a99c40a1e54854f0ae419a73a3bc Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 01 五月 2026 00:41:24 +0800
Subject: [PATCH] fix:登录注册修改
---
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/auth/service/AppAuthService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/auth/service/AppAuthService.java b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/auth/service/AppAuthService.java
index ed36eac..9f19c16 100644
--- a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/auth/service/AppAuthService.java
+++ b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/auth/service/AppAuthService.java
@@ -249,23 +249,27 @@
}
/**
- * 按微信 openid 查询本地 APP 用户。
+ * 按微信 openid 查询本地 APP 用户，重复脏数据场景优先返回启用且已绑定手机号的账号。
*/
private AppUser findUserByWechatOpenid(String openid) {
return userMapper.selectOne(new LambdaQueryWrapper<AppUser>()
.eq(AppUser::getWechatOpenid, openid)
.eq(AppUser::getDeleted, 0)
- .last("limit 1"));
+ .last("ORDER BY CASE WHEN status = 1 THEN 0 ELSE 1 END, "
+ + "CASE WHEN phone IS NOT NULL AND TRIM(phone) <> '' THEN 0 ELSE 1 END, "
+ + "updated_at DESC, id DESC LIMIT 1"));
}
/**
- * 按苹果 subject 查询本地 APP 用户。
+ * 按苹果 subject 查询本地 APP 用户，重复脏数据场景优先返回启用且已绑定手机号的账号。
*/
private AppUser findUserByAppleSubject(String subject) {
return userMapper.selectOne(new LambdaQueryWrapper<AppUser>()
.eq(AppUser::getAppleIdentitySubject, subject)
.eq(AppUser::getDeleted, 0)
- .last("limit 1"));
+ .last("ORDER BY CASE WHEN status = 1 THEN 0 ELSE 1 END, "
+ + "CASE WHEN phone IS NOT NULL AND TRIM(phone) <> '' THEN 0 ELSE 1 END, "
+ + "updated_at DESC, id DESC LIMIT 1"));
}
/**
--
Gitblit v1.7.1