From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 6554255..7797c6c 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -147,9 +147,9 @@
 	}
 
 	@Override
-	public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId, String tenantId) {
+	public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
-		return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
+		return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList));
 	}
 
 	@Override

--
Gitblit v1.9.3