From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
index 30a83db..d6fc19d 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
@@ -22,6 +22,7 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
+import org.springblade.system.user.vo.UsersVo;
import java.util.List;
@@ -42,6 +43,16 @@
* @return
*/
List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ /**
+ * 自定义分页(带坐标)
+ *
+ * @param page
+ * @param user
+ * @param deptIdList
+ * @param
+ * @return
+ */
+ List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList);
/**
* 获取用户
@@ -60,4 +71,10 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ /**
+ * 查询处警人员列表
+ * @param user 用户对象
+ * @param page 分页
+ */
+ List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
}
--
Gitblit v1.9.3