From 9d6b0b35a33a6d6abe56bb1b92135df01c5b4567 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 十二月 2022 14:30:01 +0800
Subject: [PATCH] update redisson 3.18.0 => 3.19.0
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 148 ++++++++++++++++++++----------------------------
1 files changed, 62 insertions(+), 86 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 39f62bc..9b585e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -1,111 +1,87 @@
package com.ruoyi.system.mapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
+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.annotation.DataColumn;
+import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 鐢ㄦ埛琛� 鏁版嵁灞�
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public interface SysUserMapper
-{
+public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, SysUser> {
+
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "u.user_id")
+ })
+ Page<SysUser> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
- *
- * @param sysUser 鐢ㄦ埛淇℃伅
+ *
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public List<SysUser> selectUserList(SysUser sysUser);
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "u.user_id")
+ })
+ List<SysUser> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸查厤鐢ㄦ埛瑙掕壊鍒楄〃
+ *
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "u.user_id")
+ })
+ Page<SysUser> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "u.user_id")
+ })
+ Page<SysUser> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
/**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserByUserName(String userName);
+ SysUser selectUserByUserName(String userName);
+
+ /**
+ * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴�
+ *
+ * @param phonenumber 鎵嬫満鍙�
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ SysUser selectUserByPhonenumber(String phonenumber);
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserById(Long userId);
+ SysUser selectUserById(Long userId);
- /**
- * 鏂板鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉
- */
- public int insertUser(SysUser user);
-
- /**
- * 淇敼鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉
- */
- public int updateUser(SysUser user);
-
- /**
- * 淇敼鐢ㄦ埛澶村儚
- *
- * @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
- * @return 缁撴灉
- */
- public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
-
- /**
- * 閲嶇疆鐢ㄦ埛瀵嗙爜
- *
- * @param userName 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @return 缁撴灉
- */
- public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
-
- /**
- * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
- *
- * @param userId 鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public int deleteUserById(Long userId);
-
- /**
- * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
- * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public int deleteUserByIds(Long[] userIds);
-
- /**
- * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
- *
- * @param userName 鐢ㄦ埛鍚嶇О
- * @return 缁撴灉
- */
- public int checkUserNameUnique(String userName);
-
- /**
- * 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
- *
- * @param phonenumber 鎵嬫満鍙风爜
- * @return 缁撴灉
- */
- public SysUser checkPhoneUnique(String phonenumber);
-
- /**
- * 鏍￠獙email鏄惁鍞竴
- *
- * @param email 鐢ㄦ埛閭
- * @return 缁撴灉
- */
- public SysUser checkEmailUnique(String email);
}
--
Gitblit v1.9.3