From 644ed3e30bbee9a417dfbe649f2a72df25a7efb1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 8d908b6..34ee592 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -47,7 +47,7 @@
* @param tenantId
* @return
*/
- List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
* 获取用户
@@ -113,4 +113,26 @@
* @return
*/
List selectPeo(@Param("user") UserVO user);
+
+ /**
+ * 查询当前部门名称及父级部门名称
+ * @param deptId 部门名称
+ * @return
+ */
+ @SqlParser(filter = true)
+ List<String> getDeptName(@Param("deptId") String deptId);
+
+ /**
+ * 查询用户年龄
+ * @param id
+ * @return
+ */
+ int getUserAge(@Param("id") long id);
+
+ /**
+ * 查询保安证编号位数
+ * @param pre
+ * @return
+ */
+ Integer getSecurityPaperCount(@Param("pre") String pre);
}
--
Gitblit v1.9.3