From 2a15ccf3ea3d680f9d69b2f1e9fd6a62b824546b Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Fri, 3 Jan 2025 11:27:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3488):=20=E6=9F=A5=E8=AF=A2=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=8F=AD=E7=BB=84=E5=A1=AB=E5=85=85=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/service/impl/ProjectTeamServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java index db26d78..bbb464f 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java @@ -1,5 +1,6 @@ package cn.axzo.orgmanax.server.project.team.service.impl; +import cn.axzo.orgmanax.dto.node.dto.NodeProfile; import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO; import cn.axzo.orgmanax.dto.node.enums.NodeTypeEnum; import cn.axzo.orgmanax.dto.node.req.ListNodeReq; @@ -8,6 +9,7 @@ import cn.axzo.orgmanax.dto.project.team.req.ListProjectTeamReq; import cn.axzo.orgmanax.server.node.service.NodeService; import cn.axzo.orgmanax.server.project.team.service.ProjectTeamService; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -39,7 +41,18 @@ public class ProjectTeamServiceImpl implements ProjectTeamService { .workspaceIds(req.getWorkspaceIds()) .build(); List orgNodeDTOS = nodeService.list(nodeReq); - return BeanUtil.copyToList(orgNodeDTOS, OrgProjectTeamDTO.class); + List orgProjectTeamDTOS = CollUtil.newArrayList(); + if (CollUtil.isEmpty(orgNodeDTOS)) { + return orgProjectTeamDTOS; + } + orgNodeDTOS.forEach(orgNodeDTO -> { + OrgProjectTeamDTO orgProjectTeamDTO = new OrgProjectTeamDTO(); + BeanUtil.copyProperties(orgNodeDTO, orgProjectTeamDTO); + NodeProfile.ProjectTeamProfile projectTeamProfile = orgNodeDTO.resolveProfile(); + BeanUtil.copyProperties(projectTeamProfile, orgProjectTeamDTO); + orgProjectTeamDTOS.add(orgProjectTeamDTO); + }); + return orgProjectTeamDTOS; } } \ No newline at end of file