|
@@ -757,7 +757,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
return baseMapper.getUserVosPage(page, userDTO, new DataScope());
|
|
|
} else if (SecurityUtils.getRoles().contains(2) || SecurityUtils.getRoles().contains(35)) {
|
|
|
// 人数据权限
|
|
|
- List<Integer> bcRoles = Stream.of(2, 3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47).collect(Collectors.toList());
|
|
|
+ List<Integer> bcRoles = Stream.of(2, 3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49).collect(Collectors.toList());
|
|
|
if (CollUtil.isNotEmpty(userDTO.getRole())) {
|
|
|
Collection<Integer> intersection = CollUtil.intersectionDistinct(bcRoles, userDTO.getRole());
|
|
|
if (CollUtil.isEmpty(intersection)) {
|
|
@@ -777,7 +777,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
return baseMapper.getUserVosPage(page, userDTO, new DataScope());
|
|
|
} else if (SecurityUtils.getRoles().contains(35)) {
|
|
|
// BC总负责人数据权限
|
|
|
- List<Integer> bcRoles = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47).collect(Collectors.toList());
|
|
|
+ List<Integer> bcRoles = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 ,48, 49).collect(Collectors.toList());
|
|
|
if (CollUtil.isNotEmpty(userDTO.getRole())) {
|
|
|
Collection<Integer> intersection = CollUtil.intersectionDistinct(bcRoles, userDTO.getRole());
|
|
|
if (CollUtil.isEmpty(intersection)) {
|