From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
index 09e13cf..9383906 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.guns.core.dataScope.DataScope;
import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.model.UserListVO;
+import com.dsh.guns.modular.system.model.UserQuery;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -51,10 +53,17 @@
*/
Integer getMenuNumByRole(@Param("roleStr") String roleStr);
+
+
List<Map<String,Object>> getUserListPage(@Param("page") Page<Map<String, Object>> page,
@Param("dataScope") DataScope dataScope,
@Param("name") String name,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
- @Param("deptid") Integer deptid);
+ @Param("deptid") Integer deptid,
+ @Param("objectType") Integer objectType,
+ @Param("objectId") Integer objectId);
+
+ List<UserListVO> searchUsers(@Param("query") UserQuery userQuery);
+
}
\ No newline at end of file
--
Gitblit v1.7.1