|
|
|
@ -542,7 +542,7 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
|
List<Long> roles = Lists.newArrayList();
|
|
|
|
|
Long roleId = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getId).collect(Collectors.toList()));
|
|
|
|
|
// 判断角色,管理员只查组长角色的用户
|
|
|
|
|
if (!roleId.equals(RoleNumberConstants.MINUS_EIGHT_NUMBER)) {
|
|
|
|
|
if (!roleId.equals(RoleNumberConstants.MINUS_EIGHT_NUMBER) || !roleId.equals(RoleNumberConstants.MINUS_TEN_NUMBER)) {
|
|
|
|
|
roles.add(RoleNumberConstants.MINUS_FIVE_NUMBER);
|
|
|
|
|
} else {
|
|
|
|
|
roles.add(RoleNumberConstants.MINUS_NINE_NUMBER);
|
|
|
|
|