From 3ebbdb08594641a92d5448510ea134c4c6bd3cb8 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 5 Mar 2026 18:58:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(task):=20=E4=BF=AE=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AF=84=E5=88=86=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/command/query/ProjectTaskQueryExe.java | 15 ++++++++++----- .../domain/dto/clientobject/ProjectTaskCO.java | 8 +++++++- .../persistence/dataobject/ProjectTaskDO.java | 3 +++ .../impl/ProjectTaskRepositoryImpl.java | 2 ++ .../main/resources/mapper/ProjectTaskMapper.xml | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/domain/command/query/ProjectTaskQueryExe.java b/web-app/src/main/java/com/zcloud/domain/command/query/ProjectTaskQueryExe.java index b0ecec7..c804645 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/query/ProjectTaskQueryExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/query/ProjectTaskQueryExe.java @@ -60,17 +60,22 @@ public class ProjectTaskQueryExe { * 1. 股份端看所有数据，企业端只能执行单位是自己的数据 * 2. 主账号可以修改企业下创建的所有数据，个人账号，只能修改自己创建的数据 */ - examCenterCOS.forEach(videoCoursewareCO -> { + examCenterCOS.forEach(info -> { //如果是企业，可以看本企业下所有的，如果是个人，只能看个人的，判断登录的账号是企业主账号还是个人 Boolean isCorpAccount = corpInfoRepository.checkCorp(); // 企业账户：检查租户ID匹配 - if (isCorpAccount && AuthContext.getTenantId().equals(videoCoursewareCO.getTenantId())) { - videoCoursewareCO.setIsUserCreate(true); + if (isCorpAccount && AuthContext.getTenantId().equals(info.getTenantId())) { + info.setIsUserCreate(true); return; } // 个人账户：检查创建者ID匹配 - if (!isCorpAccount && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { - videoCoursewareCO.setIsUserCreate(true); + if (!isCorpAccount && info.getCreateId().equals(AuthContext.getUserId())) { + info.setIsUserCreate(true); + } + + //只有组长和企业主账号可以看到 指定课题组人员按钮 + if (isCorpAccount || AuthContext.getUserId().equals(info.getTeamUserId())){ + info.setIsDomainGroupUser(true); } }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskCO.java b/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskCO.java index 6c73276..fddc892 100644 --- a/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskCO.java +++ b/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskCO.java @@ -1,6 +1,7 @@ package com.zcloud.domain.dto.clientobject; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -71,9 +72,14 @@ public class ProjectTaskCO implements Serializable { private Long tenantId; - + @ApiModelProperty(value = "领域组组长id") + @TableField(exist = false) + private Long teamUserId; @ApiModelProperty(value = "是否是当前用户创建的数据") private Boolean isUserCreate = false; + + @ApiModelProperty(value = "是否是指定课题组人员按钮") + private Boolean isDomainGroupUser = false; } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskDO.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskDO.java index b1c6c25..d9cdd27 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskDO.java @@ -71,6 +71,9 @@ public class ProjectTaskDO extends BaseDO { @ApiModelProperty(value = "领域组名称") @TableField(exist = false) private String domainGroupName; + @ApiModelProperty(value = "领域组组长id") + @TableField(exist = false) + private Long teamUserId; public ProjectTaskDO(String projectTaskId) { this.projectTaskId = projectTaskId; diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java index 653d05a..2aea0d1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java @@ -51,6 +51,8 @@ public class ProjectTaskRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); IPage result = projectTaskMapper.listPage(iPage, params,menuPerms); + + return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml b/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml index 5c8a43b..c1331e6 100644 --- a/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml @@ -4,7 +4,7 @@