From 977444532d644d48b5b55ca89a1e3d62b5dd8782 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 19 May 2021 17:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index aeb994f..375f074 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -26,6 +26,7 @@
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.excel.UserExcel;
 import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.UsersVo;
 
 import java.util.List;
 
@@ -70,6 +71,16 @@
 	 * @return
 	 */
 	IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+	/**
+	 * 自定义分页(带坐标)
+	 *
+	 * @param page
+	 * @param user
+	 * @param deptId
+	 * @param
+	 * @return
+	 */
+	IPage<User> selectUserPages(IPage<User> page, User user, String deptId);
 
 	/**
 	 * 用户信息
@@ -194,4 +205,19 @@
 	 * @return
 	 */
 	UserVO platformDetail(User user);
+
+	/**
+	 * 查询处警人员列表
+	 * @param page  分页
+	 * @param user  用户对象
+	 * @return
+	 */
+	IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user);
+
+	/**
+	 * 根据用户编号查询用户新
+	 * @param code 用户编号
+	 * @return
+	 */
+    User selUserByCode(String code);
 }

--
Gitblit v1.9.3