|
@@ -485,6 +485,7 @@ public class MeetingManage { |
|
|
if (CollUtil.isNotEmpty(randoms)) { |
|
|
if (CollUtil.isNotEmpty(randoms)) { |
|
|
randoms.forEach(random -> { |
|
|
randoms.forEach(random -> { |
|
|
RandomInviteRuleVO randomRule = JSON.parseObject(random.getInviteRule(), RandomInviteRuleVO.class); |
|
|
RandomInviteRuleVO randomRule = JSON.parseObject(random.getInviteRule(), RandomInviteRuleVO.class); |
|
|
|
|
|
randomRule.setId(random.getId()); |
|
|
if (randomRule.getExpertTags() != null) { |
|
|
if (randomRule.getExpertTags() != null) { |
|
|
randomRule.getExpertTags().forEach(w -> { |
|
|
randomRule.getExpertTags().forEach(w -> { |
|
|
List<String> tagNames = CollUtils.convert(w.getTagCodes(), tagCode -> tagCache.getByTagCode(tagCode).getTagName()); |
|
|
List<String> tagNames = CollUtils.convert(w.getTagCodes(), tagCode -> tagCache.getByTagCode(tagCode).getTagName()); |
|
@@ -525,6 +526,7 @@ public class MeetingManage { |
|
|
List<ExpertInviteRule> appoints = groupByType.get(ExpertInviteTypeEnum.APPOINT); |
|
|
List<ExpertInviteRule> appoints = groupByType.get(ExpertInviteTypeEnum.APPOINT); |
|
|
ExpertInviteRule appoint = appoints.get(0); |
|
|
ExpertInviteRule appoint = appoints.get(0); |
|
|
AppointInviteRuleDTO appointRule = JSON.parseObject(appoint.getInviteRule(), AppointInviteRuleDTO.class); |
|
|
AppointInviteRuleDTO appointRule = JSON.parseObject(appoint.getInviteRule(), AppointInviteRuleDTO.class); |
|
|
|
|
|
appointRule.setId(appoint.getId()); |
|
|
AppointRuleVO vo = new AppointRuleVO(); |
|
|
AppointRuleVO vo = new AppointRuleVO(); |
|
|
vo.setInviteDesc(appointRule.getInviteDesc()); |
|
|
vo.setInviteDesc(appointRule.getInviteDesc()); |
|
|
vo.setExperts(new ArrayList<>(meetingManageHelper.getExpertBasicInfo(appointRule.getExpertIdList()).values())); |
|
|
vo.setExperts(new ArrayList<>(meetingManageHelper.getExpertBasicInfo(appointRule.getExpertIdList()).values())); |
|
|