diff --git a/src/main/java/com/labelsys/backend/service/UserService.java b/src/main/java/com/labelsys/backend/service/UserService.java index f38bda0..86f1ee4 100644 --- a/src/main/java/com/labelsys/backend/service/UserService.java +++ b/src/main/java/com/labelsys/backend/service/UserService.java @@ -43,12 +43,9 @@ public class UserService { public List listAllUsers(LoginUser currentUser) { try { assertSystemAdmin(currentUser); -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper() -// .eq(SysUser::getPosition, UserPosition.ADMIN) // 添加岗位过滤 -// .orderByAsc(SysUser::getId); LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .ne(SysUser::getId, currentUser.userId()) - .eq(SysUser::getPosition, UserPosition.ADMIN) + .in(SysUser::getPosition, UserPosition.ADMIN, UserPosition.SUPER_ADMIN) .orderByAsc(SysUser::getId); return sysUserMapper.selectList(wrapper); } catch (ForbiddenException e) {