|
@@ -400,17 +400,20 @@ public class VppTeamServiceImpl implements VppTeamService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 计算需要设置得团队管理员
|
|
|
+ // 计算需要设置的团队管理员
|
|
|
List<String> teamAdminId = new ArrayList<>();
|
|
|
// 获取现有团队所有关联关系
|
|
|
List<VppRTeamMemberRole> allByTeamId = vppRTeamMemberRoleService.getAllByTeamId(dto.getTeamId());
|
|
|
if (CollectionUtils.isEmpty(allByTeamId)) {
|
|
|
teamAdminId = dto.getTeamAdminId();
|
|
|
} else {
|
|
|
+ // 获取团队所有管理员
|
|
|
List<VppRTeamMemberRole> vppRTeamMemberRoleList = allByTeamId.stream().filter(c -> c.getRoleId().equals("2")).collect(Collectors.toList());
|
|
|
+ // 如果没设置过管理员
|
|
|
if (CollectionUtils.isEmpty(vppRTeamMemberRoleList)) {
|
|
|
teamAdminId = dto.getTeamAdminId();
|
|
|
} else {
|
|
|
+ // 已设置管理员用户id
|
|
|
List<String> vppAdminIdList = vppRTeamMemberRoleList.stream().map(VppRTeamMemberRole::getMemberId).collect(Collectors.toList());
|
|
|
// 判断管理员是否已设置
|
|
|
for (String s : dto.getTeamAdminId()) {
|
|
@@ -426,6 +429,8 @@ public class VppTeamServiceImpl implements VppTeamService {
|
|
|
VppRTeamMemberRoleExample vppRTeamMemberRoleExample = new VppRTeamMemberRoleExample();
|
|
|
vppRTeamMemberRoleExample.createCriteria().andMemberIdEqualTo(vppRTeamMemberRole.getMemberId()).andTeamIdEqualTo(dto.getTeamId());
|
|
|
vppRTeamMemberRoleService.deleteByExample(vppRTeamMemberRoleExample);
|
|
|
+ // 删除管理员去除序列码关联
|
|
|
+ vppLicenseCodeService.unBindByMemberId(vppRTeamMemberRole.getMemberId(), null);
|
|
|
}
|
|
|
}
|
|
|
}
|