diff --git a/src/main/java/com/labelsys/backend/service/UserService.java b/src/main/java/com/labelsys/backend/service/UserService.java index 29ced5a..f38bda0 100644 --- a/src/main/java/com/labelsys/backend/service/UserService.java +++ b/src/main/java/com/labelsys/backend/service/UserService.java @@ -43,7 +43,13 @@ public class UserService { public List listAllUsers(LoginUser currentUser) { try { assertSystemAdmin(currentUser); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper().orderByAsc(SysUser::getId); +// 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) + .orderByAsc(SysUser::getId); return sysUserMapper.selectList(wrapper); } catch (ForbiddenException e) { throw e; diff --git a/src/main/resources/mapper/AnnotationResultMapper.xml b/src/main/resources/mapper/AnnotationResultMapper.xml index b67a4a1..28abf75 100644 --- a/src/main/resources/mapper/AnnotationResultMapper.xml +++ b/src/main/resources/mapper/AnnotationResultMapper.xml @@ -8,6 +8,8 @@ + + @@ -18,8 +20,8 @@ - id, company_id, creator_id, creator_role, task_id, resource_id, qa_content_file_path, - diff_summary_file_path, requires_manual_review, is_deleted, reviewer_id, + id, company_id, creator_id, creator_role, task_id, resource_id, task_name, resource_name, + qa_content_file_path, diff_summary_file_path, requires_manual_review, is_deleted, reviewer_id, created_at, updated_at @@ -50,4 +52,4 @@ and company_id = #{companyId} and is_deleted = false - + \ No newline at end of file