From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 2cf6391..ea1b89b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;
@@ -11,6 +12,10 @@
* @author ruoyi
*/
public interface ISysUserService extends IService<SysUser> {
+
+
+ TableDataInfo<SysUser> selectPageUserList(SysUser user);
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
*
@@ -18,6 +23,22 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
public List<SysUser> selectUserList(SysUser user);
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ public TableDataInfo<SysUser> selectAllocatedList(SysUser user);
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ public TableDataInfo<SysUser> selectUnallocatedList(SysUser user);
/**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
@@ -99,6 +120,14 @@
public int updateUser(SysUser user);
/**
+ * 鐢ㄦ埛鎺堟潈瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param roleIds 瑙掕壊缁�
+ */
+ public void insertUserAuth(Long userId, Long[] roleIds);
+
+ /**
* 淇敼鐢ㄦ埛鐘舵��
*
* @param user 鐢ㄦ埛淇℃伅
@@ -118,7 +147,7 @@
* 淇敼鐢ㄦ埛澶村儚
*
* @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
+ * @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
public boolean updateUserAvatar(String userName, String avatar);
@@ -159,9 +188,9 @@
/**
* 瀵煎叆鐢ㄦ埛鏁版嵁
*
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
+ * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
* @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
+ * @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
--
Gitblit v1.9.3