From dca2532f01dac86be25ad09fa9ee8035bccdca6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 27 Nov 2021 17:11:33 +0800
Subject: [PATCH] 1.部门tree修改 2.用户查询修改 3.培训报名年龄拦截

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 3e59148..15166d4 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -23,6 +23,7 @@
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.system.excel.SecurityExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.node.TreeNode;
@@ -43,8 +44,6 @@
 	 *
 	 * @param page
 	 * @param user
-	 * @param deptIdList
-	 * @param tenantId
 	 * @return
 	 */
 	List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
@@ -218,9 +217,9 @@
 	List<Map<String, Object>> getSecurityInfo(@Param("jurisdiction")String jurisdiction);
 
 	/**
-	 * 导出保安员证信息
+	 * 导出保安员信息
 	 * @param user
 	 * @return
 	 */
-    List<UserVO> exportSecurityPaperList(@Param("user") UserVO user);
+	List<SecurityExcel> exportSecurityInfo(@Param("user") UserVO user);
 }

--
Gitblit v1.9.3