diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/domain/vo/GitLinkUserSimpleInfoVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/domain/vo/GitLinkUserSimpleInfoVo.java index 977df6e72..d9cf4cdf7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/domain/vo/GitLinkUserSimpleInfoVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/domain/vo/GitLinkUserSimpleInfoVo.java @@ -5,6 +5,7 @@ import com.microservices.common.core.enums.SystemRole; import com.microservices.common.core.utils.bean.BeanUtils; import com.microservices.common.core.utils.html.EscapeUtil; import com.microservices.system.api.domain.SimpleSysRole; +import com.microservices.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,6 +31,14 @@ public class GitLinkUserSimpleInfoVo this.email = user.getString("mail"); } + public GitLinkUserSimpleInfoVo(SysUser sysUser) { + this.username = sysUser.getUserName(); + this.userId = sysUser.getGitlinkUserId(); + this.imageUrl = sysUser.getAvatar(); + this.nickname = sysUser.getNickName(); + this.email = sysUser.getEmail(); + } + @ApiModelProperty(value = "用户名") private String username; diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java index abf2a1496..28660e0ae 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java @@ -225,6 +225,14 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { List gitlinkUserList = pmsCommonService.getAllGitlinkUsersByOrgTeam( pmsEnterprise.getEnterpriseIdentifier(), gitlinkOrganizationTeamVo.getId() ); + if ("owner".equalsIgnoreCase(gitlinkOrganizationTeamVo.getAuthorize())) { + boolean currentUserIsOwner = gitlinkUserList.stream().anyMatch(x -> x.getUserId().equals(SecurityUtils.getGitlinkUserId())); + if (!currentUserIsOwner) { + if (SecurityUtils.getLoginUser() != null) { + gitlinkUserList.add(new GitLinkUserSimpleInfoVo(SecurityUtils.getLoginUser().getSysUser())); + } + } + } for (GitLinkUserSimpleInfoVo gitLinkUserSimpleInfoVo : gitlinkUserList) { if (gitLinkUserSimpleInfoVo.getUserId() == null) { break;