From 965f3cf1799b8aaff3c5045476f406a2edb712f8 Mon Sep 17 00:00:00 2001
From: wh <wanghao@qq.com>
Date: Tue, 12 May 2026 16:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E8=B0=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/labelsys/backend/service/UserService.java    | 8 +++++++-
 src/main/resources/mapper/AnnotationResultMapper.xml      | 8 +++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

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<SysUser> listAllUsers(LoginUser currentUser) {
         try {
             assertSystemAdmin(currentUser);
-            LambdaQueryWrapper wrapper = new LambdaQueryWrapper<SysUser>().orderByAsc(SysUser::getId);
+//            LambdaQueryWrapper wrapper = new LambdaQueryWrapper<SysUser>()
+//                    .eq(SysUser::getPosition, UserPosition.ADMIN)  // 添加岗位过滤
+//                    .orderByAsc(SysUser::getId);
+            LambdaQueryWrapper wrapper = new LambdaQueryWrapper<SysUser>()
+                    .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 @@
         <result column="creator_role" property="creatorRole"/>
         <result column="task_id" property="taskId"/>
         <result column="resource_id" property="resourceId"/>
+        <result column="task_name" property="taskName"/>
+        <result column="resource_name" property="resourceName"/>
         <result column="qa_content_file_path" property="qaContentFilePath"/>
         <result column="diff_summary_file_path" property="diffSummaryFilePath"/>
         <result column="requires_manual_review" property="requiresManualReview"/>
@@ -18,8 +20,8 @@
     </resultMap>
 
     <sql id="AnnotationResultColumns">
-        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
     </sql>
 
@@ -50,4 +52,4 @@
           and company_id = #{companyId}
           and is_deleted = false
     </update>
-</mapper>
+</mapper>
\ No newline at end of file