1、修改会议类型列表接口

2、修改操作日志切面类
3、创建模板接口添加响应字段

src/main/java/com/cmeeting/aspect/OperLogAspect.java

@@ -27,10 +27,10 @@ public class OperLogAspect {
     @After(value = "@annotation(operLog)")
     public void after(JoinPoint point, OperLog operLog) {
 
-        new Thread(() -> {
-            Date now = new Date();
-            RobotSecurityUser user = SecurityUtil.getUser();
+        Date now = new Date();
+        RobotSecurityUser user = SecurityUtil.getUser();
 
+        new Thread(() -> {
             String location = operLog.location();
             String operation = operLog.operation();
 
@@ -43,5 +43,6 @@ public class OperLogAspect {
 
             operationLogService.save(operationLog);
         }).start();
+
     }
 }

src/main/java/com/cmeeting/controller/RecordTemplateController.java

@@ -48,8 +48,8 @@ public class RecordTemplateController {
     @PostMapping("/create")
     public R create(@RequestBody @Validated(EditRecordTemplateVo.AddGroup.class) EditRecordTemplateVo recordTemplate) {
 
-        recordTemplateService.save(recordTemplate);
-        return R.ok();
+        Long id = recordTemplateService.save(recordTemplate);
+        return R.ok(id);
     }
 
     /**

src/main/java/com/cmeeting/service/MeetingRecordTemplateService.java

@@ -52,7 +52,7 @@ public interface MeetingRecordTemplateService extends IService<MeetingRecordTemp
      * 保存模板
      * @param recordTemplateVo 请求参数
      */
-    void save(EditRecordTemplateVo recordTemplateVo);
+    Long save(EditRecordTemplateVo recordTemplateVo);
 
     /**
      * 更新模板

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

@@ -248,7 +248,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
      * @param recordTemplateVo 请求参数
      */
     @Override
-    public void save(EditRecordTemplateVo recordTemplateVo) {
+    public Long save(EditRecordTemplateVo recordTemplateVo) {
         MeetType meetType = meetTypeMapper.selectById(recordTemplateVo.getMeetingTypeId());
         if (MeetingTypeConstant.PERSONAL_PERMISSION_NO == meetType.getPersonalPermission()) {
             throw new RobotBaseException("当前会议类型下不允许新建纪要模板");
@@ -272,7 +272,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         recordTemplate.setCreateUserName(loginUser.getUsername());
         recordTemplate.setUpdateUserName(loginUser.getUsername());
         baseMapper.insert(recordTemplate);
-
+        return recordTemplate.getId();
         // 没有保存到启用表中，默认是不启用的。
     }
 

src/main/resources/mapper/primary/MeetingRecordTemplateMapper.xml

@@ -104,7 +104,7 @@
         from
             meet_type
                 left join cmt_meeting_record_template on meet_type.id = cmt_meeting_record_template.meeting_type and cmt_meeting_record_template.is_del = 0
-                    and cmt_meeting_record_template.type = 'custom'
+                    and cmt_meeting_record_template.type = 'custom' and cmt_meeting_record_template.create_user = #{userId}
                 LEFT JOIN meet_template_enable ON cmt_meeting_record_template.id = meet_template_enable.rel_id
                     AND meet_template_enable.user_id = #{userId}
         where