bug修复

ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java

@@ -57,7 +57,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
 
         // 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
         String openid = auth.getOpenId();
-        XcxLoginUser loginUser = remoteUserService.getUserInfoByOpenid(openid, loginBody.getClientId());
+        XcxLoginUser loginUser = remoteUserService.getUserInfoByOpenid(openid, loginBody.getTenantId());
 
         // 用户不存在 返回 openid
         if (loginUser == null) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java

@@ -159,7 +159,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         }
 
         //根据手机号查询用户信息
-        SysUserVo user = userService.selectUserByPhonenumber(wxUser.getPhonenumber());
+        SysUserVo user = userService.selectUserByPhonenumber(wxUser.getPhonenumber(), wxUser.getTenantId());
         if (!ObjectUtil.isNotNull(user)) {
             throw new UserException("user.not.exists", wxUser.getPhonenumber());
         }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -55,9 +55,10 @@ public interface ISysUserService {
      * 通过手机号查询用户
      *
      * @param phonenumber 手机号
+     * @param tenantId tenantId
      * @return 用户对象信息
      */
-    SysUserVo selectUserByPhonenumber(String phonenumber);
+    SysUserVo selectUserByPhonenumber(String phonenumber,String tenantId);
 
     /**
      * 通过用户ID查询用户

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -157,11 +157,13 @@ public class SysUserServiceImpl implements ISysUserService {
      * 通过手机号查询用户
      *
      * @param phonenumber 手机号
+     * @param tenantId    tenantId
      * @return 用户对象信息
      */
     @Override
-    public SysUserVo selectUserByPhonenumber(String phonenumber) {
-        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
+    public SysUserVo selectUserByPhonenumber(String phonenumber, String tenantId) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber)
+            .eq(SysUser::getTenantId, tenantId));
     }
 
     /**