From ac14b6e6e8de485a2d7b02cea1a9214cc1e28f41 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 10:39:18 +0800
Subject: [PATCH] 培训考试生成修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 2588620..2e186a2 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -180,9 +180,17 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<UserVO> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ //遍历获取部门名称，角色名称
+ users.forEach(userVO -> {
+ //查询当前部门名称及父级部门名称
+ List<Map<String,Object>> map = baseMapper.getDeptName(userVO.getDeptId());
+ //查询角色名称
+
+ });
+ return page.setRecords(users);
}
@Override
--
Gitblit v1.9.3