|
@@ -771,7 +771,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
// 48平台监察员
|
|
|
// 49生产企业监察员
|
|
|
// 50事业部管理员
|
|
|
- userDTO.setRole(ListUtil.of( 3, 4, 5, 37, 38, 39, 40, 41, 42, 43, 44, 45, 47, 48, 49, 50));
|
|
|
+
|
|
|
+ List<Integer> role = userDTO.getRole();
|
|
|
+ if (CollUtil.isEmpty(role)) {
|
|
|
+ userDTO.setRole(ListUtil.of( 3, 4, 5, 37, 38, 39, 40, 41, 42, 43, 44, 45, 47, 48, 49, 50));
|
|
|
+ }
|
|
|
+
|
|
|
return baseMapper.getUserVosPage(page, userDTO, new DataScope());
|
|
|
}
|
|
|
else if (SecurityUtils.getRoles().contains(2) /*|| SecurityUtils.getRoles().contains(35)*/) {
|