From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 5 +++--
1 files changed, 3 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..73d0910 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
@@ -313,6 +313,7 @@
@Override
public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
+
List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
userList.forEach(user -> {
user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
--
Gitblit v1.9.3