From c5565c37e2ef504bc21b1b9126bcaee871b8ee7a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 04 三月 2025 09:52:43 +0800
Subject: [PATCH] bug修改

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 3f0f789..17b3fba 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -118,8 +118,8 @@
         appletUserDecodeData.setOpenId(openid);
         // 先使用openId和当前手机号进行查询
         TTenant tenant = tTenantService.getOne(Wrappers.lambdaQuery(TTenant.class)
-                .eq(TTenant::getOpenId, appletUserDecodeData.getOpenId())
-                .eq(TTenant::getPhone, appletUserDecodeData.getPhoneNumber()));
+                .and(e->e.eq(TTenant::getOpenId, appletUserDecodeData.getOpenId()).or()
+                .eq(TTenant::getPhone, appletUserDecodeData.getPhoneNumber())));
         if (tenant==null){
 //            appUser.setTenantAttributes();
 //            appUser.setTenantType();

--
Gitblit v1.7.1