From 9bbb34239f62fd6e40d7b507672fd68b5289c1ba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 00:55:46 +0800
Subject: [PATCH] 设备列表接口修改，新增部门信息接口
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 7797c6c..892455b 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
@@ -143,7 +143,8 @@
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<User> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ return page.setRecords(users);
}
@Override
@@ -313,6 +314,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