1、修改返回的reportType，2、为空时报表分组关联关系不再新增

src/main/java/com/link/report/pojo/request/CustomerReportGroupVo.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 @Data
 public class CustomerReportGroupVo {
-    private String id;
+    private String groupId;
     private String groupName;
     private List<ReportItemsDto> items;
 }

src/main/java/com/link/report/pojo/response/ReportShareBiListDto.java

@@ -17,7 +17,7 @@ public class ReportShareBiListDto {
     private String previewUrl;
     private String reportName;
     // 报表类型，0自定义报表 1 积木报表
-    private Integer reportType;
+    private Integer reportType = 1;
 
 
 }

src/main/java/com/link/report/service/impl/CustomerReportGroupServiceImpl.java

 package com.link.report.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.link.report.domain.dao.CustomerGroupDao;
 import com.link.report.domain.dao.CustomerReportGroupDao;
 import com.link.report.domain.entity.CustomerReportGroup;
@@ -55,6 +56,7 @@ public class CustomerReportGroupServiceImpl implements CustomerReportGroupServic
                     itemsDto.setReportId(reportGroupQueryListDto.getReportId());
                     itemsDto.setReportName(reportGroupQueryListDto.getReportName());
                     itemsDto.setPreviewUrl(reportGroupQueryListDto.getPreviewUrl());
+                    itemsDto.setReportType(reportGroupQueryListDto.getReportType());
                     itemsDtos.add(itemsDto);
                 }
             }
@@ -86,7 +88,7 @@ public class CustomerReportGroupServiceImpl implements CustomerReportGroupServic
                 CustomerReportGroup dto = new CustomerReportGroup();
                 // 雪花算法生成id
                 dto.setId(IdUtil.getSnowflakeNextIdStr());
-                dto.setGroupId(vo.getId());
+                dto.setGroupId(vo.getGroupId());
                 dto.setReportId(item.getReportId());
                 dto.setReportType(item.getReportType());
                 dto.setCreateBy(String.valueOf(userId));
@@ -94,6 +96,8 @@ public class CustomerReportGroupServiceImpl implements CustomerReportGroupServic
                 items.add(dto);
             }
         }
+        if(ObjectUtil.isNotEmpty(items)){
             customerReportGroupDao.batchInsert(items);
         }
+    }
 }

src/main/resources/mapper/report/CustomerReportGroupMapper.xml

@@ -47,7 +47,7 @@
         cr.preview_url as previewUrl
         FROM
         customer_group cg
-        join customer_report_group crg on crg.group_id = cg.id
+        join customer_report_group crg on crg.group_id = cg.id and crg.report_type = 0
         join customer_report cr on crg.report_id = cr.id and crg.report_type = cr.report_type
 
         <where>