1、修改新增更新纪要模板接口

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -269,7 +269,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
      */
     @Override
     public void save(EditRecordTemplateVo recordTemplateVo) {
-        MeetType meetType = meetTypeMapper.selectById(recordTemplateVo.getId());
+        MeetType meetType = meetTypeMapper.selectById(recordTemplateVo.getMeetingTypeId());
         if (MeetingTypeConstant.PERSONAL_PERMISSION_NO == meetType.getPersonalPermission()) {
             throw new RobotBaseException("当前会议类型下不允许新建纪要模板");
         }
@@ -279,15 +279,15 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
 
         MeetingRecordTemplate recordTemplate = new MeetingRecordTemplate();
         recordTemplate.setName(recordTemplateVo.getName());
-        recordTemplate.setType(recordTemplateVo.getType());
+        recordTemplate.setType(RecordTemplateConstant.TEMPLATE_TYPE_CUSTOM);
         recordTemplate.setMeetingType(recordTemplateVo.getMeetingTypeId());
         recordTemplate.setTypeDetail(recordTemplateVo.getTypeDetail());
         recordTemplate.setPrompt(recordTemplateVo.getPrompt());
         recordTemplate.setReferTemplateId(recordTemplateVo.getReferTemplateId());
         recordTemplate.setCreateTime(now);
         recordTemplate.setUpdateTime(now);
-        recordTemplate.setCreateUser(loginUser.getId());
-        recordTemplate.setUpdateUser(loginUser.getId());
+        recordTemplate.setCreateUser(loginUser.getUserId());
+        recordTemplate.setUpdateUser(loginUser.getUserId());
         recordTemplate.setCreateUserName(loginUser.getUsername());
         recordTemplate.setUpdateUserName(loginUser.getUsername());
         baseMapper.insert(recordTemplate);
@@ -309,8 +309,6 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         MeetingRecordTemplate recordTemplate = new MeetingRecordTemplate();
         recordTemplate.setId(recordTemplateVo.getId());
         recordTemplate.setName(recordTemplateVo.getName());
-        recordTemplate.setType(recordTemplateVo.getType());
-        recordTemplate.setMeetingType(recordTemplateVo.getMeetingTypeId());
         recordTemplate.setTypeDetail(recordTemplateVo.getTypeDetail());
         recordTemplate.setPrompt(recordTemplateVo.getPrompt());
         recordTemplate.setReferTemplateId(recordTemplateVo.getReferTemplateId());

src/main/java/com/cmeeting/vo/EditRecordTemplateVo.java

@@ -18,7 +18,7 @@ public class EditRecordTemplateVo {
     private Long id;
 
     // 会议类型id
-    @NotNull(message = "meetingTypeId不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotNull(message = "meetingTypeId不能为空", groups = {AddGroup.class})
     private Long meetingTypeId;
 
     // 模板名称
@@ -36,12 +36,6 @@ public class EditRecordTemplateVo {
     @NotEmpty(message = "prompt不能为空", groups = {AddGroup.class, UpdateGroup.class})
     private String prompt;
 
-    /**
-     * 模板类型，system-系统创建，custom-用户创建
-     */
-    @NotEmpty(message = "type不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    private String type;
-
 
 
     public interface AddGroup{};