From dac72f785021147c0156df7f7171e011b59a5adf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 15:39:06 +0800
Subject: [PATCH] 用户查询接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 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 c1fa1d7..2eeb085 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
@@ -183,32 +183,41 @@
public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
List<UserVO> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
- //遍历获取部门名称，角色名称
- users.forEach(userVO -> {
- //查询当前部门名称及父级部门名称
- List<String> list = baseMapper.getDeptName(userVO.getDeptId());
- if (list.size()>1){
- if (null!=list.get(1) && list.get(1)!=""){
- userVO.setDeptName(list.get(1)+","+list.get(0));
- }else {
- userVO.setDeptName(list.get(0));
+ if(users.size()>0){
+ //遍历获取部门名称，角色名称
+ users.forEach(userVO -> {
+ //查询当前部门名称及父级部门名称
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ } else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size() == 1) {
+ userVO.setDeptName(list.get(0));
+ }
}
- }
- if (list.size()==1){
- userVO.setDeptName(list.get(0));
- }
- //查询角色名称
- List<String> asList = Arrays.asList(userVO.getRoleId().split(","));
- StringBuilder builder = new StringBuilder();
- asList.forEach(roleIs ->{
- Role role = roleService.getById(roleIs);
- if (null!=role){
- builder.append(role.getRoleName()+",");
+ //查询角色名称
+ if (null!=userVO.getRoleId()) {
+ List<String> asList = Arrays.asList(userVO.getRoleId().split(","));
+ StringBuilder builder = new StringBuilder();
+ asList.forEach(roleIs -> {
+ Role role = roleService.getById(roleIs);
+ if (null != role) {
+ builder.append(role.getRoleName() + ",");
+ }
+ });
+ String substringRoleName = null;
+ if (builder.toString().length() > 0) {
+ substringRoleName = builder.toString().substring(0, builder.toString().length() - 1);
+ }
+ userVO.setRoleName(substringRoleName);
}
});
- String substringRoleName = builder.toString().substring(0, builder.toString().length() - 1);
- userVO.setRoleName(substringRoleName);
- });
+ }
return page.setRecords(users);
}
--
Gitblit v1.9.3