From 37794b5738639e60c8fdb6a196fc13d682d732d4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 三月 2023 10:32:13 +0800
Subject: [PATCH] fix 修复 多租户相同账号登录失败问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 9ea7762..8fe4148 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -1,12 +1,13 @@
package com.ruoyi.system.mapper;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
-import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
+import com.ruoyi.system.domain.SysUser;
import com.ruoyi.system.domain.vo.SysUserVo;
import org.apache.ibatis.annotations.Param;
@@ -78,6 +79,26 @@
SysUserVo selectUserByPhonenumber(String phonenumber);
/**
+ * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�(涓嶈蛋绉熸埛鎻掍欢)
+ *
+ * @param userName 鐢ㄦ埛鍚�
+ * @param tenantId 绉熸埛id
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ SysUserVo selectTenantUserByUserName(String userName, String tenantId);
+
+ /**
+ * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴�(涓嶈蛋绉熸埛鎻掍欢)
+ *
+ * @param phonenumber 鎵嬫満鍙�
+ * @param tenantId 绉熸埛id
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ SysUserVo selectTenantUserByPhonenumber(String phonenumber, String tenantId);
+
+ /**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
*
* @param userId 鐢ㄦ埛ID
--
Gitblit v1.9.3