|
@@ -528,6 +528,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
|
|
|
queryWrapper.isNotNull("leader_id");
|
|
queryWrapper.isNotNull("leader_id");
|
|
|
|
|
|
|
|
List<SysUser> users = sysUserMapper.selectList(queryWrapper);
|
|
List<SysUser> users = sysUserMapper.selectList(queryWrapper);
|
|
|
|
|
+ List<SysUser> userList = users.stream().filter(SysUser -> !SysUser.getId().contains("M")).collect(Collectors.toList());
|
|
|
if (users == null || users.size() == 0) {
|
|
if (users == null || users.size() == 0) {
|
|
|
return new ArrayList<>();
|
|
return new ArrayList<>();
|
|
|
}
|
|
}
|
|
@@ -540,7 +541,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
|
|
|
topUsers.add(sysUser);
|
|
topUsers.add(sysUser);
|
|
|
}
|
|
}
|
|
|
// 递归构建用户树结构
|
|
// 递归构建用户树结构
|
|
|
- buildUserTree(topUsers, users);
|
|
|
|
|
|
|
+ buildUserTree(topUsers, userList);
|
|
|
return topUsers;
|
|
return topUsers;
|
|
|
}
|
|
}
|
|
|
|
|
|