From 69e3afc7707d467b758858b52d3784947f7a502b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 五月 2024 10:25:23 +0800
Subject: [PATCH] !538 ♥️发布 5.2.0-BETA 公测版本 Merge pull request !538 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java | 47 ++++++++++++-----------------------------------
1 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
index 4322225..fc7fc6e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
@@ -8,6 +8,7 @@
import org.dromara.common.mybatis.annotation.DataPermission;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysUserExportVo;
import org.dromara.system.domain.vo.SysUserVo;
import java.util.List;
@@ -20,10 +21,16 @@
public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
@DataPermission({
- @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "deptName", value = "u.dept_id"),
@DataColumn(key = "userName", value = "u.user_id")
})
Page<SysUserVo> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "dept_id"),
+ @DataColumn(key = "userName", value = "user_id")
+ })
+ List<SysUserVo> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -35,7 +42,7 @@
@DataColumn(key = "deptName", value = "d.dept_id"),
@DataColumn(key = "userName", value = "u.user_id")
})
- List<SysUserVo> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+ List<SysUserExportVo> selectUserExportList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸查厤鐢ㄦ埛瑙掕壊鍒楄〃
@@ -61,41 +68,11 @@
})
Page<SysUserVo> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
- /**
- * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
- *
- * @param userName 鐢ㄦ埛鍚�
- * @return 鐢ㄦ埛瀵硅薄淇℃伅
- */
- SysUserVo selectUserByUserName(String userName);
-
- /**
- * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴�
- *
- * @param phonenumber 鎵嬫満鍙�
- * @return 鐢ㄦ埛瀵硅薄淇℃伅
- */
- SysUserVo selectUserByPhonenumber(String phonenumber);
-
- /**
- * 閫氳繃閭鏌ヨ鐢ㄦ埛
- *
- * @param email 閭
- * @return 鐢ㄦ埛瀵硅薄淇℃伅
- */
- SysUserVo selectUserByEmail(String email);
-
- /**
- * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
- *
- * @param userId 鐢ㄦ埛ID
- * @return 鐢ㄦ埛瀵硅薄淇℃伅
- */
@DataPermission({
- @DataColumn(key = "deptName", value = "d.dept_id"),
- @DataColumn(key = "userName", value = "u.user_id")
+ @DataColumn(key = "deptName", value = "dept_id"),
+ @DataColumn(key = "userName", value = "user_id")
})
- SysUserVo selectUserById(Long userId);
+ long countUserById(Long userId);
@Override
@DataPermission({
--
Gitblit v1.9.3