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

src/main/java/com/cmeeting/dto/MeetTypeDto.java

@@ -15,7 +15,6 @@ import java.util.List;
 public class MeetTypeDto {
 
     // 会议类型id
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     // 类型名称
     private String name;

src/main/java/com/cmeeting/dto/RecordTemplateDto.java

@@ -10,7 +10,6 @@ import java.util.Date;
 @Data
 public class RecordTemplateDto {
     // 模板id
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     // 模板名称
     private String name;

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

@@ -331,7 +331,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         if (ObjectUtils.isEmpty(recordTemplate)) {
             throw new RobotBaseException("当前纪要模板不存在");
         }
-        Long meetTypeId = recordTemplate.getId();
+        Long meetTypeId = recordTemplate.getMeetingType();
         // 根据会议类型和用户id删除已开启的模板
         meetTemplateEnableMapper.delete(new QueryWrapper<MeetTemplateEnable>()
                 .eq("meet_type_id", meetTypeId)

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

@@ -111,12 +111,12 @@
                 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'
                 left join module_permission on module_permission.target_id = cmt_meeting_record_template.id and module_permission.type = 0
-                    and module_permission.purpose = 2
-                LEFT JOIN meet_template_enable ON cmt_meeting_record_template.id = meet_template_enable.rel_id
-                    AND meet_template_enable.user_id = #{userId} and module_permission.rel_id in
+                    and module_permission.purpose = 2 and module_permission.rel_id in
                     <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")" index="index">
                         #{deptId}
                     </foreach>
+                LEFT JOIN meet_template_enable ON cmt_meeting_record_template.id = meet_template_enable.rel_id
+                    AND meet_template_enable.user_id = #{userId}
         where
             meet_type.is_del = 0
 
@@ -129,9 +129,9 @@
                 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'
                 left join module_permission on module_permission.target_id = cmt_meeting_record_template.id and module_permission.type = 1
-                    and module_permission.purpose = 2
+                    and module_permission.purpose = 2 and module_permission.rel_id = #{userId}
                 LEFT JOIN meet_template_enable ON cmt_meeting_record_template.id = meet_template_enable.rel_id
-                    AND meet_template_enable.user_id = #{userId} and module_permission.rel_id = #{userId}
+                    AND meet_template_enable.user_id = #{userId}
         where
             meet_type.is_del = 0