提交 94260694 作者: 洪东保

debug-名称重复

父级 57d9323c
...@@ -277,7 +277,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT ...@@ -277,7 +277,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
Integer count = baseMapper.selectCount(new LambdaQueryWrapper<MeetingRecordTemplate>() Integer count = baseMapper.selectCount(new LambdaQueryWrapper<MeetingRecordTemplate>()
.eq(MeetingRecordTemplate::getName, recordTemplateVo.getName()) .eq(MeetingRecordTemplate::getName, recordTemplateVo.getName())
.eq(MeetingRecordTemplate::getType, SecurityUtil.getUser().getType()) .eq(MeetingRecordTemplate::getType, SecurityUtil.getUser().getRole())
.eq(role.equals(MeetingTypeConstant.TYPE_CUSTOM), MeetingRecordTemplate::getCreateUser, userId)); .eq(role.equals(MeetingTypeConstant.TYPE_CUSTOM), MeetingRecordTemplate::getCreateUser, userId));
if (count > 0) { if (count > 0) {
throw new RobotBaseException("添加失败。当前纪要模板名称已存在。"); throw new RobotBaseException("添加失败。当前纪要模板名称已存在。");
...@@ -531,6 +531,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT ...@@ -531,6 +531,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
} }
} }
// 每个会议类型下有一个兜底启用的模板 // 每个会议类型下有一个兜底启用的模板
if (role.equals(RecordTemplateConstant.TEMPLATE_TYPE_CUSTOM)) {
meetTypeDtos.forEach(meetTypeDto -> { meetTypeDtos.forEach(meetTypeDto -> {
AtomicBoolean exist = new AtomicBoolean(false); AtomicBoolean exist = new AtomicBoolean(false);
if (CollUtil.isNotEmpty(meetTypeDto.getRecordTemplateDTOList())) { if (CollUtil.isNotEmpty(meetTypeDto.getRecordTemplateDTOList())) {
...@@ -545,6 +546,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT ...@@ -545,6 +546,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
} }
} }
}); });
}
return meetTypeDtos; return meetTypeDtos;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论