From 35a6e9cedc2f44bebc9e4ec81a429eddc8b631ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 11:41:42 +0800
Subject: [PATCH] 用户查询接口修改,部门名称需拼接父部门名称

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |   17 ++++++++++++++++-
 1 files changed, 16 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..afcf10c 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);
 
 	/**
 	 * 获取用户
@@ -177,4 +177,19 @@
 
 
 	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);
 }

--
Gitblit v1.9.3