From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index e03bbcc..3e59148 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -59,7 +59,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+	List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
 
 	/**
 	 * 获取用户
@@ -106,6 +106,16 @@
 	@MapKey(value = "id")
 	@SqlParser(filter=true)
 	Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
+
+
+	/**
+	 * 派遣保安员列表树 安员列表树,帅选无保安证,下拉tree
+	 * @param user 用户信息
+	 * @return
+	 */
+	@MapKey(value = "id")
+	@SqlParser(filter=true)
+	Map<Long, TreeNode> getSecurityDispatcherTree(@Param("user") UserVO user);
 
 
 	List<Map<Object,Object>> selectInr(String deptid);
@@ -177,4 +187,40 @@
 
 
 	DispatcherVO getDispatcherInfoByUserId(Long userId);
+
+	/**
+	 * 查询账号相同的用户数量
+	 * @param account
+	 * @return
+	 */
+    Integer selectCountAccount(@Param("account") String account);
+
+	/**
+	 * 查询当前部门名称及父级部门名称
+	 * @param deptId 部门名称
+	 * @return
+	 */
+	@SqlParser(filter = true)
+	List<String> getDeptName(@Param("deptId") String deptId);
+
+	/**
+	 * 查询用户表中未删除,未离职的用户信息
+	 * @param username
+	 * @return
+	 */
+    User getUserInfo(@Param("account") String username);
+
+	/**
+	 * 现场检查获取保安员
+	 * @param jurisdiction
+	 * @return
+	 */
+	List<Map<String, Object>> getSecurityInfo(@Param("jurisdiction")String jurisdiction);
+
+	/**
+	 * 导出保安员证信息
+	 * @param user
+	 * @return
+	 */
+    List<UserVO> exportSecurityPaperList(@Param("user") UserVO user);
 }

--
Gitblit v1.9.3