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/mapper/UserMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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..9f355db 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,7 +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 +42,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<String> deptIdList);
/**
* 获取用户
@@ -60,4 +70,17 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ /**
+ * 查询处警人员列表
+ * @param user 用户对象
+ * @param page 分页
+ */
+ List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+
+ /**
+ * 根据用户编号查询用户信息
+ * @param code 用户编号
+ * @return
+ */
+ User selUserByCode(String code);
}
--
Gitblit v1.9.3