wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'

Browse Source 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!169
This commit is contained in:
张弘昊 2025-01-13 06:44:24 +00:00
commit 3877b11c04
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/dto/OrgProjectTeamDTO.java
View File

@ -121,59 +121,6 @@ public class OrgProjectTeamDTO implements Serializable {
*/
private Integer enterProjectType = 1;
// 新冗余字段
private Long belongProjectTeamNodeId;
// org_project_group 字段
/**
* 主键id
*/
private Long projectGroupId;
/**
* 小组类型 0-直属小组 1-合作小组
*/
private Integer type;
/**
* 所属的项目内班组id
*/
private Long belongProjectTeamId;
/**
* 所属的平台班组id
*/
private Long belongPlatTeamId;
/**
* (合作小组才有)原项目内班组id
*/
private Long sourceProjectTeamId;
/**
* (合作小组才有)原平台班组id
*/
private Long sourcePlatTeamId;
/**
* 小组长权限集
*/
private Long permissionGroup;
/**
* 小组长工人身份id
*/
private Long ownerWorkerIdentityId;
/**
* 小组长项目内工人id
*/
private Long ownerProjectWorkerId;
/**
* 小组管理类型 0-班组管理 1-小组长管理
*/
private Integer manageType;
private Long teamOuId;
private Long teamNodeId;
private Long nodeId;

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
View File

@ -55,8 +55,6 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
BeanUtil.copyProperties(orgNodeDTO, orgProjectTeamDTO);
NodeProfile.ProjectTeamProfile projectTeamProfile = orgNodeDTO.resolveProfile();
BeanUtil.copyProperties(projectTeamProfile, orgProjectTeamDTO);
NodeProfile.ProjectGroupProfile groupProfile = orgNodeDTO.resolveProfile();
BeanUtil.copyProperties(groupProfile, orgProjectTeamDTO);
orgProjectTeamDTO.setOrganizationalNodeId(orgNodeDTO.getId());
orgProjectTeamDTOS.add(orgProjectTeamDTO);
});