whfh/lablesys_backend
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev54'

Browse Source
This commit is contained in:
wh
2026-05-12 16:11:22 +08:00
parent 4a84af3023 965f3cf179
commit a226d1f1ad
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/labelsys/backend/service/UserService.java
View File

@@ -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;

6
src/main/resources/mapper/AnnotationResultMapper.xml
View File

@@ -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>