From 2e92773b8ce9e70615e61c84136bbedd702aad8c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 31 三月 2023 10:19:28 +0800
Subject: [PATCH] update 优化 角色 sort 值一样的排序问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 19df29b..2aacf48 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
@@ -18,7 +18,7 @@
*
* @author Lion Li
*/
-public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, SysUserVo> {
+public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
@DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"),
@@ -79,6 +79,14 @@
SysUserVo selectUserByPhonenumber(String phonenumber);
/**
+ * 閫氳繃閭鏌ヨ鐢ㄦ埛
+ *
+ * @param email 閭
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ SysUserVo selectUserByEmail(String email);
+
+ /**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�(涓嶈蛋绉熸埛鎻掍欢)
*
* @param userName 鐢ㄦ埛鍚�
@@ -99,11 +107,25 @@
SysUserVo selectTenantUserByPhonenumber(String phonenumber, String tenantId);
/**
+ * 閫氳繃閭鏌ヨ鐢ㄦ埛(涓嶈蛋绉熸埛鎻掍欢)
+ *
+ * @param email 閭
+ * @param tenantId 绉熸埛id
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ SysUserVo selectTenantUserByEmail(String email, String tenantId);
+
+ /**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
*
* @param userId 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "u.user_id")
+ })
SysUserVo selectUserById(Long userId);
@Override
@@ -111,7 +133,7 @@
@DataColumn(key = "deptName", value = "dept_id"),
@DataColumn(key = "userName", value = "user_id")
})
- int update(@Param(Constants.ENTITY) SysUser user,@Param(Constants.WRAPPER) Wrapper<SysUser> updateWrapper);
+ int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper<SysUser> updateWrapper);
@Override
@DataPermission({
--
Gitblit v1.9.3